master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'skystar-p-config_credential_fix'

Browse Source
This commit is contained in:
Mészáros Mihály 2017-12-15 15:48:43 +01:00
commit 615666cba2
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,8 @@
12/11/2017 Oleg Moskalenko <mom040267@gmail.com>
Version 4.5.0.8 'dan Eider':
- Spelling fixes.
- Add a warning if --lt-cred-mech and --use-auth-secret both presents.
12/10/2017 Oleg Moskalenko <mom040267@gmail.com>
Version 4.5.0.7 'dan Eider':
- Misc security improvements.

13
src/apps/relay/mainrelay.c
View File

@ -39,6 +39,10 @@
static int use_lt_credentials = 0;
static int anon_credentials = 0;
//long term credential
static int use_ltc = 0;
//timelimited long term credential
static int use_tltc = 0;
////// ALPN //////////
@ -1162,6 +1166,7 @@ static void set_option(int c, char *value)
if (get_bool_value(value)) {
turn_params.ct = TURN_CREDENTIALS_LONG_TERM;
use_lt_credentials=1;
use_ltc=1;
} else {
turn_params.ct = TURN_CREDENTIALS_UNDEFINED;
use_lt_credentials=0;
@ -1223,12 +1228,14 @@ static void set_option(int c, char *value)
#endif
case AUTH_SECRET_OPT:
turn_params.use_auth_secret_with_timestamp = 1;
use_tltc = 1;
turn_params.ct = TURN_CREDENTIALS_LONG_TERM;
use_lt_credentials = 1;
break;
case STATIC_AUTH_SECRET_VAL_OPT:
add_to_secrets_list(&turn_params.default_users_db.ram_db.static_auth_secrets,value);
turn_params.use_auth_secret_with_timestamp = 1;
use_tltc = 1;
turn_params.ct = TURN_CREDENTIALS_LONG_TERM;
use_lt_credentials = 1;
break;
@ -1989,6 +1996,12 @@ int main(int argc, char **argv)
exit(-1);
}
if(use_ltc && use_tltc) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "\nCONFIGURATION ALERT: You specified --lt-cred-mech and --use-auth-secret in the same time.\n"
"Be aware that you could not mix the username/password and the shared secret based auth methohds. \n"
"Shared secret overrides username/password based auth method. Check your configuration!\n");
}
if(!use_lt_credentials && !anon_credentials) {
if(turn_params.default_users_db.ram_db.users_number) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "\nCONFIGURATION ALERT: you specified long-term user accounts, (-u option) \n but you did not specify the long-term credentials option\n (-a or --lt-cred-mech option).\n I am turning --lt-cred-mech ON for you, but double-check your configuration.\n");