From 49c88a557676e577b0e8dee563e2d0100296b0c2 Mon Sep 17 00:00:00 2001 From: mom040267 Date: Wed, 21 Jan 2015 18:43:47 +0000 Subject: [PATCH] start working on oauth --- src/apps/relay/dbdrivers/dbd_sqlite.c | 2 +- src/apps/relay/turn_admin_server.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/apps/relay/dbdrivers/dbd_sqlite.c b/src/apps/relay/dbdrivers/dbd_sqlite.c index f5f2c6d..e4ea4d0 100644 --- a/src/apps/relay/dbdrivers/dbd_sqlite.c +++ b/src/apps/relay/dbdrivers/dbd_sqlite.c @@ -447,7 +447,7 @@ static int sqlite_set_oauth_key(oauth_key_data_raw *key) ret = 0; } else { const char* errmsg = sqlite3_errmsg(sqliteconnection); - TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Error retrieving SQLite DB information: %s\n", errmsg); + TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Error updating SQLite DB information: %s\n", errmsg); } sqlite3_finalize(st); diff --git a/src/apps/relay/turn_admin_server.c b/src/apps/relay/turn_admin_server.c index b8ba215..4b54ae6 100644 --- a/src/apps/relay/turn_admin_server.c +++ b/src/apps/relay/turn_admin_server.c @@ -1363,6 +1363,7 @@ enum _AS_FORM { AS_FORM_USERS, AS_FORM_SS, AS_FORM_OS, + AS_FORM_OAUTH, AS_FORM_UNKNOWN }; @@ -1408,6 +1409,7 @@ static struct form_name form_names[] = { {AS_FORM_USERS,"/us"}, {AS_FORM_SS,"/ss"}, {AS_FORM_OS,"/os"}, + {AS_FORM_OAUTH,"/oauth"}, {AS_FORM_UNKNOWN,NULL} }; @@ -1556,6 +1558,10 @@ static void write_https_home_page(ioa_socket_handle s) str_buffer_append(sb,form_names[AS_FORM_OS].name); str_buffer_append(sb,"\">"); + str_buffer_append(sb,"
"); + str_buffer_append(sb,"\r\n"); str_buffer_append(sb,"\r\n"); @@ -3190,6 +3196,15 @@ static void handle_https(ioa_socket_handle s, ioa_network_buffer_handle nbh) } break; } + case AS_FORM_OAUTH: { + if(s->as_ok) { + //TODO + write_https_home_page(s); + } else { + write_https_logon_page(s); + } + break; + } case AS_FORM_TOGGLE: if(s->as_ok) { handle_toggle_request(s,hr);