Browse Source

start working on oauth

mom040267 11 years ago
parent
commit
49c88a5576
2 changed files with 16 additions and 1 deletions
  1. 1 1
      src/apps/relay/dbdrivers/dbd_sqlite.c
  2. 15 0
      src/apps/relay/turn_admin_server.c

+ 1 - 1
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);
 

+ 15 - 0
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,"<br><input type=\"submit\" value=\"oAuth keys\" formaction=\"");
+			str_buffer_append(sb,form_names[AS_FORM_OAUTH].name);
+			str_buffer_append(sb,"\">");
+
 			str_buffer_append(sb,"</fieldset>\r\n");
 			str_buffer_append(sb,"</form>\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);