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

openvidu-server: Redis turn DB

pull/88/merge
pabloFuente 2018-06-22 13:42:49 +02:00
parent 04e0c51165
commit 001d938312
4 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -58,8 +58,17 @@ public class OpenviduConfig {
@Value("#{'${spring.profiles.active:}'.length() > 0 ? '${spring.profiles.active:}'.split(',') : \"default\"}")
private String springProfile;
@Value("${coturn.sqlite}")
private String coturnSqlite;
@Value("${coturn.redis.ip}")
private String coturnRedisIp;
@Value("${coturn.redis.dbname}")
private String coturnRedisDbname;
@Value("${coturn.redis.password}")
private String coturnRedisPassword;
@Value("${coturn.redis.connect-timeout}")
private String coturnRedisConnectTimeout;
private String finalUrl;
@ -123,8 +132,9 @@ public class OpenviduConfig {
return springProfile;
}
public String getCoturnSqlite() {
return coturnSqlite;
public String getCoturnDatabaseString() {
return "\"ip=" + this.coturnRedisIp + " dbname=" + this.coturnRedisDbname + " password="
+ this.coturnRedisPassword + " connect_timeout=" + this.coturnRedisConnectTimeout + "\"";
}
public ParticipantRole[] getRolesFromRecordingNotification() {

48
openvidu-server/src/main/java/io/openvidu/server/coturn/BashCoturnCredentialsService.java
View File

@ -1,6 +1,5 @@
package io.openvidu.server.coturn;
import java.io.File;
import java.io.IOException;
import org.apache.commons.lang3.RandomStringUtils;
@ -12,24 +11,20 @@ public class BashCoturnCredentialsService extends CoturnCredentialsService {
public BashCoturnCredentialsService(OpenviduConfig openviduConfig) {
super(openviduConfig);
File f = new File(this.openviduConfig.getCoturnSqlite());
if (f.exists()) {
f.delete();
}
this.coturnDatabaseLocation = this.openviduConfig.getCoturnSqlite();
try {
String response = CommandExecutor.execCommand("/bin/sh", "-c", "turnadmin -l -b " + this.coturnDatabaseLocation);
String response = CommandExecutor.execCommand("/bin/sh", "-c",
"turnadmin -l -N " + this.coturnDatabaseString);
if (response.contains("turnadmin: not found")) {
// No coturn installed in the host machine
log.warn("No COTURN server is installed in the host machine");
log.warn("No COTURN server will be configured for clients");
log.warn("No COTURN server is installed in the host machine. Response: " + response);
log.warn("No COTURN server will be automatically configured for clients");
this.coturnAvailable = false;
} else if (response.contains("Cannot open SQLite DB connection")) {
log.warn("COTURN SQLite database is not accesible at path " + this.coturnDatabaseLocation);
log.warn("No COTURN server will be configured for clients");
} else if (response.contains("Cannot initialize Redis DB connection")) {
log.warn("Redis DB is not accesible with connection string " + this.coturnDatabaseString);
log.warn("No COTURN server will be automatically configured for clients");
this.coturnAvailable = false;
} else {
log.info("COTURN sqlite database location: " + this.openviduConfig.getCoturnSqlite());
log.info("COTURN Redis DB accessible with string " + this.coturnDatabaseString);
}
} catch (IOException | InterruptedException e) {
e.printStackTrace();
@ -43,22 +38,17 @@ public class BashCoturnCredentialsService extends CoturnCredentialsService {
log.info("Creating COTURN user");
String user = RandomStringUtils.randomAlphanumeric(6).toUpperCase();
String pass = RandomStringUtils.randomAlphanumeric(6).toLowerCase();
String command = "turnadmin -a -u " + user + " -r openvidu -p " + pass + " -b " + this.coturnDatabaseLocation;
String users = "";
lock.lock();
String command = "turnadmin -a -u " + user + " -r openvidu -p " + pass + " -N " + this.coturnDatabaseString;
try {
CommandExecutor.execCommand("/bin/sh", "-c", command);
users = CommandExecutor.execCommand("/bin/sh", "-c", "turnadmin -l -b " + this.coturnDatabaseLocation);
} catch (IOException | InterruptedException e) {
e.printStackTrace();
} finally {
lock.unlock();
if (users.contains(user + "[openvidu]")) {
String response = CommandExecutor.execCommand("/bin/sh", "-c", command);
if (response.contains("connection success: " + this.trimmedCoturnDatabaseString)) {
credentials = new TurnCredentials(user, pass);
log.info("COTURN user created: true");
} else {
log.info("COTURN user created: false");
}
} catch (IOException | InterruptedException e) {
e.printStackTrace();
}
return credentials;
}
@ -68,18 +58,14 @@ public class BashCoturnCredentialsService extends CoturnCredentialsService {
boolean userRemoved = false;
log.info("Deleting COTURN user");
String command = "turnadmin -d -u " + user + " -r openvidu -b" + this.coturnDatabaseLocation;
String users = "";
lock.lock();
String command = "turnadmin -d -u " + user + " -r openvidu -N " + this.coturnDatabaseString;
String response = "";
try {
CommandExecutor.execCommand("/bin/sh", "-c", command);
users = CommandExecutor.execCommand("/bin/sh", "-c", "turnadmin -l -b " + this.coturnDatabaseLocation);
response = CommandExecutor.execCommand("/bin/sh", "-c", command);
} catch (IOException | InterruptedException e) {
e.printStackTrace();
} finally {
lock.unlock();
}
userRemoved = !users.contains(user + "[openvidu]");
userRemoved = response.contains("connection success: " + this.trimmedCoturnDatabaseString);
log.info("COTURN user deleted: " + userRemoved);
return userRemoved;
}

9
openvidu-server/src/main/java/io/openvidu/server/coturn/CoturnCredentialsService.java
View File

@ -1,7 +1,5 @@
package io.openvidu.server.coturn;
import java.util.concurrent.locks.ReentrantLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -15,14 +13,15 @@ public abstract class CoturnCredentialsService {
protected OpenviduConfig openviduConfig;
protected String coturnDatabaseLocation;
protected String coturnDatabaseString;
protected String trimmedCoturnDatabaseString;
protected boolean coturnAvailable = true;
protected ReentrantLock lock = new ReentrantLock();
public CoturnCredentialsService(OpenviduConfig openviduConfig) {
this.openviduConfig = openviduConfig;
this.coturnDatabaseString = this.openviduConfig.getCoturnDatabaseString();
this.trimmedCoturnDatabaseString = this.coturnDatabaseString.replaceAll("^\"|\"$", "");
}
public abstract TurnCredentials createUser();

5
openvidu-server/src/main/resources/application.properties
View File

@ -21,4 +21,7 @@ openvidu.recording.custom-layout: /opt/openvidu/custom-layout
kms.uris=[\"ws://localhost:8888/kurento\"]
coturn.sqlite=/opt/openvidu/coturn/turndb
coturn.redis.ip=127.0.0.1
coturn.redis.dbname=0
coturn.redis.password=turn
coturn.redis.connect-timeout=30