ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disallow session creation from public clients

pull/583/head
Battula Sai Vinesh 2020-12-28 14:23:27 +00:00
parent 7e9b16d1ca
commit 3e95c702d0
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openvidu-server/deployments/ce/docker-compose/.env
View File

@ -7,10 +7,10 @@
# Domain name. If you do not have one, the public IP of the machine. # Domain name. If you do not have one, the public IP of the machine.
# For example: 198.51.100.1, or openvidu.example.com # For example: 198.51.100.1, or openvidu.example.com
DOMAIN_OR_PUBLIC_IP= DOMAIN_OR_PUBLIC_IP=psdev4.superkinglabs.com
# OpenVidu SECRET used for apps to connect to OpenVidu server and users to access to OpenVidu Dashboard # OpenVidu SECRET used for apps to connect to OpenVidu server and users to access to OpenVidu Dashboard
OPENVIDU_SECRET= OPENVIDU_SECRET=MY_SECRET11
# Certificate type: # Certificate type:
# - selfsigned: Self signed certificate. Not recommended for production use. # - selfsigned: Self signed certificate. Not recommended for production use.
@ -21,10 +21,10 @@ OPENVIDU_SECRET=
# - letsencrypt: Generate a new certificate using letsencrypt. Please set the # - letsencrypt: Generate a new certificate using letsencrypt. Please set the
# required contact email for Let's Encrypt in LETSENCRYPT_EMAIL # required contact email for Let's Encrypt in LETSENCRYPT_EMAIL
# variable. # variable.
CERTIFICATE_TYPE=selfsigned CERTIFICATE_TYPE=letsencrypt
# If CERTIFICATE_TYPE=letsencrypt, you need to configure a valid email for notifications # If CERTIFICATE_TYPE=letsencrypt, you need to configure a valid email for notifications
LETSENCRYPT_EMAIL=user@example.com LETSENCRYPT_EMAIL=ajaykumar@gameberrylabs.com
# Proxy configuration # Proxy configuration
# If you want to change the ports on which openvidu listens, uncomment the following lines # If you want to change the ports on which openvidu listens, uncomment the following lines
@ -37,7 +37,7 @@ LETSENCRYPT_EMAIL=user@example.com
# Changes the port of all services exposed by OpenVidu. # Changes the port of all services exposed by OpenVidu.
# SDKs, REST clients and browsers will have to connect to this port # SDKs, REST clients and browsers will have to connect to this port
# HTTPS_PORT=443 HTTPS_PORT=4443
# Old paths are considered now deprecated, but still supported by default. # Old paths are considered now deprecated, but still supported by default.
# OpenVidu Server will log a WARN message every time a deprecated path is called, indicating # OpenVidu Server will log a WARN message every time a deprecated path is called, indicating
@ -126,15 +126,6 @@ OPENVIDU_STREAMS_VIDEO_MAX_SEND_BANDWIDTH=1000
# 0 means unconstrained # 0 means unconstrained
OPENVIDU_STREAMS_VIDEO_MIN_SEND_BANDWIDTH=300 OPENVIDU_STREAMS_VIDEO_MIN_SEND_BANDWIDTH=300
# All sessions of OpenVidu will try to force this codec. If OPENVIDU_STREAMS_ALLOW_TRANSCODING=true
# when a codec can not be forced, transcoding will be allowed
# Default value is VP8
# OPENVIDU_STREAMS_FORCED_VIDEO_CODEC=VP8
# Allow transcoding if codec specified in OPENVIDU_STREAMS_FORCED_VIDEO_CODEC can not be applied
# Default value is false
# OPENVIDU_STREAMS_ALLOW_TRANSCODING=false
# true to enable OpenVidu Webhook service. false' otherwise # true to enable OpenVidu Webhook service. false' otherwise
# Values: true | false # Values: true | false
OPENVIDU_WEBHOOK=false OPENVIDU_WEBHOOK=false

2
openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
View File

@ -360,7 +360,7 @@ public class OpenViduServer implements JsonRpcConfigurer {
String dashboardUrl = httpUrl + config.getOpenViduFrontendDefaultPath().replaceAll("^/", ""); String dashboardUrl = httpUrl + config.getOpenViduFrontendDefaultPath().replaceAll("^/", "");
// @formatter:off // @formatter:off
String msg = "\n\n----------------------------------------------------\n" + "\n" + " OpenVidu is ready!\n" String msg = "\n\n---------------------------------------###############ajay#######-------------\n" + "\n" + " OpenVidu is ready!\n"
+ " ---------------------------\n" + "\n" + " * OpenVidu Server URL: " + httpUrl + "\n" + "\n" + " ---------------------------\n" + "\n" + " * OpenVidu Server URL: " + httpUrl + "\n" + "\n"
+ " * OpenVidu Dashboard: " + dashboardUrl + "\n" + "\n" + " * OpenVidu Dashboard: " + dashboardUrl + "\n" + "\n"
+ "----------------------------------------------------\n"; + "----------------------------------------------------\n";

1
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
View File

@ -103,6 +103,7 @@ public class KurentoSessionManager extends SessionManager {
Session sessionNotActive = sessionsNotActive.get(sessionId); Session sessionNotActive = sessionsNotActive.get(sessionId);
if (sessionNotActive == null && this.isInsecureParticipant(participant.getParticipantPrivateId())) { if (sessionNotActive == null && this.isInsecureParticipant(participant.getParticipantPrivateId())) {
log.info("############# ip address is {}",participant.getLocation().getIp());
// Insecure user directly call joinRoom RPC method, without REST API use // Insecure user directly call joinRoom RPC method, without REST API use
sessionNotActive = new Session(sessionId, sessionNotActive = new Session(sessionId,
new SessionProperties.Builder().mediaMode(MediaMode.ROUTED) new SessionProperties.Builder().mediaMode(MediaMode.ROUTED)

10
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -74,6 +74,7 @@ import io.openvidu.server.recording.Recording;
import io.openvidu.server.recording.service.RecordingManager; import io.openvidu.server.recording.service.RecordingManager;
import io.openvidu.server.utils.RecordingUtils; import io.openvidu.server.utils.RecordingUtils;
import io.openvidu.server.utils.RestUtils; import io.openvidu.server.utils.RestUtils;
import javax.servlet.http.HttpServletRequest;
/** /**
* *
@ -97,10 +98,11 @@ public class SessionRestController {
protected OpenviduConfig openviduConfig; protected OpenviduConfig openviduConfig;
@RequestMapping(value = "/sessions", method = RequestMethod.POST) @RequestMapping(value = "/sessions", method = RequestMethod.POST)
public ResponseEntity<?> initializeSession(@RequestBody(required = false) Map<?, ?> params) { public ResponseEntity<?> initializeSession(@RequestBody(required = false) Map<?, ?> params, HttpServletRequest request) {
log.info("REST API: POST {}/sessions {}", RequestMappings.API, params != null ? params.toString() : "{}"); log.info("REST API: POST {}/sessions {}", RequestMappings.API, params != null ? params.toString() : "{}");
String remoteAddress = request.getHeader("X-Forwarded-For");
log.info("###### REMOTE ADDRESS {}", remoteAddress);
SessionProperties sessionProperties; SessionProperties sessionProperties;
try { try {
sessionProperties = getSessionPropertiesFromParams(params).build(); sessionProperties = getSessionPropertiesFromParams(params).build();
@ -119,6 +121,10 @@ public class SessionRestController {
+ RandomStringUtils.randomAlphanumeric(9); + RandomStringUtils.randomAlphanumeric(9);
} }
if (!remoteAddress.equals("68.183.184.220")) {
log.info("############## invalid remote added");
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
}
Session sessionNotActive = sessionManager.storeSessionNotActive(sessionId, sessionProperties); Session sessionNotActive = sessionManager.storeSessionNotActive(sessionId, sessionProperties);
log.info("New session {} initialized {}", sessionId, this.sessionManager.getSessionsWithNotActive().stream() log.info("New session {} initialized {}", sessionId, this.sessionManager.getSessionsWithNotActive().stream()
.map(Session::getSessionId).collect(Collectors.toList()).toString()); .map(Session::getSessionId).collect(Collectors.toList()).toString());