Strict session ID (swoole#3993)

matyhtf · web-flow · commit 85f7153b04fc · 2021-01-11T10:52:15.000+08:00
* Strict session ID

* optimize code
diff --git a/ext-src/swoole_http_response.cc b/ext-src/swoole_http_response.cc
@@ -39,6 +39,8 @@ extern "C" {
 #endif
 
 using swoole::coroutine::Socket;
+using swoole::Server;
+using swoole::Connection;
 using swoole::substr_len;
 using http_response = swoole::http::Response;
 using http_context = swoole::http::Context;
@@ -843,8 +845,8 @@ void swoole_http_response_end(http_context *ctx, zval *zdata, zval *return_value
 _skip_copy:
 #endif
     if (ctx->upgrade && !ctx->co_socket) {
-        swServer *serv = (swServer *) ctx->private_data;
-        swConnection *conn = serv->get_connection_by_session_id(ctx->fd);
+        Server *serv = (Server *) ctx->private_data;
+        Connection *conn = serv->get_connection_verify(ctx->fd);
         if (conn && conn->websocket_status == WEBSOCKET_STATUS_HANDSHAKE) {
             if (ctx->response.status == 101) {
                 conn->websocket_status = WEBSOCKET_STATUS_ACTIVE;
diff --git a/ext-src/swoole_server.cc b/ext-src/swoole_server.cc
@@ -3645,8 +3645,8 @@ static PHP_METHOD(swoole_server, bind) {
         RETURN_FALSE;
     }
 
-    Connection *conn = serv->get_connection_by_session_id(fd);
-    if (conn == nullptr || conn->active == 0) {
+    Connection *conn = serv->get_connection_verify(fd);
+    if (conn == nullptr) {
         RETURN_FALSE;
     }
 
@@ -3751,10 +3751,10 @@ static PHP_METHOD(swoole_server, getClientList) {
         RETURN_FALSE;
     }
 
-    zend_long start_fd = 0;
+    zend_long start_session_id = 0;
     zend_long find_count = 10;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &start_fd, &find_count) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &start_session_id, &find_count) == FAILURE) {
         RETURN_FALSE;
     }
 
@@ -3766,12 +3766,13 @@ static PHP_METHOD(swoole_server, getClientList) {
 
     // copy it out to avoid being overwritten by other processes
     int serv_max_fd = serv->get_maxfd();
+    int start_fd;
 
-    if (start_fd == 0) {
+    if (start_session_id == 0) {
         start_fd = serv->get_minfd();
     } else {
-        Connection *conn = serv->get_connection_by_session_id(start_fd);
-        if (!conn) {
+        Connection *conn = serv->get_connection_verify(start_session_id);
+        if (!serv->is_valid_connection(conn)) {
             RETURN_FALSE;
         }
         start_fd = conn->fd;
@@ -3786,10 +3787,10 @@ static PHP_METHOD(swoole_server, getClientList) {
     Connection *conn;
 
     for (; fd <= serv_max_fd; fd++) {
-        swTrace("maxfd=%d, fd=%d, find_count=%ld, start_fd=%ld", serv_max_fd, fd, find_count, start_fd);
+        swTrace("maxfd=%d, fd=%d, find_count=%ld, start_fd=%ld", serv_max_fd, fd, find_count, start_session_id);
         conn = serv->get_connection(fd);
 
-        if (conn->active && !conn->closed) {
+        if (serv->is_valid_connection(conn)) {
 #ifdef SW_USE_OPENSSL
             if (conn->ssl && !conn->ssl_ready) {
                 continue;
@@ -3842,18 +3843,14 @@ static PHP_METHOD(swoole_server, exists) {
         RETURN_FALSE;
     }
 
-    zend_long fd;
+    zend_long session_id;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
-    Z_PARAM_LONG(fd)
+    Z_PARAM_LONG(session_id)
     ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
-    Connection *conn = serv->get_connection_by_session_id(fd);
-    if (!conn) {
-        RETURN_FALSE;
-    }
-    // connection is closed
-    if (conn->active == 0 || conn->closed) {
+    Connection *conn = serv->get_connection_verify(session_id);
+    if (!conn || conn->closed) {
         RETURN_FALSE;
     } else {
         RETURN_TRUE;
@@ -3867,19 +3864,15 @@ static PHP_METHOD(swoole_server, protect) {
         RETURN_FALSE;
     }
 
-    zend_long fd;
+    zend_long session_id;
     zend_bool value = 1;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|b", &fd, &value) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|b", &session_id, &value) == FAILURE) {
         RETURN_FALSE;
     }
 
-    Connection *conn = serv->get_connection_by_session_id(fd);
-    if (!conn) {
-        RETURN_FALSE;
-    }
-    // connection is closed
-    if (conn->active == 0 || conn->closed) {
+    Connection *conn = serv->get_connection_verify(session_id);
+    if (!conn || conn->closed) {
         RETURN_FALSE;
     } else {
         conn->protect = value;
diff --git a/ext-src/swoole_websocket_server.cc b/ext-src/swoole_websocket_server.cc
@@ -907,15 +907,15 @@ static PHP_METHOD(swoole_websocket_server, isEstablished) {
         RETURN_FALSE;
     }
 
-    zend_long fd;
+    zend_long session_id;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &fd) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &session_id) == FAILURE) {
         RETURN_FALSE;
     }
 
-    Connection *conn = serv->get_connection_by_session_id(fd);
+    Connection *conn = serv->get_connection_verify(session_id);
     // not isEstablished
-    if (!conn || conn->active == 0 || conn->closed || conn->websocket_status < WEBSOCKET_STATUS_ACTIVE) {
+    if (!conn || conn->closed || conn->websocket_status < WEBSOCKET_STATUS_ACTIVE) {
         RETURN_FALSE;
     } else {
         RETURN_TRUE;
diff --git a/include/swoole_server.h b/include/swoole_server.h
@@ -1136,7 +1136,6 @@ class Server {
         Connection *conn = get_connection_verify_no_ssl(session_id);
 #ifdef SW_USE_OPENSSL
         if (conn && conn->ssl && !conn->ssl_ready) {
-            swoole_error_log(SW_LOG_NOTICE, SW_ERROR_SSL_NOT_READY, "SSL not ready");
             return nullptr;
         }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,6 @@ class Server {`
`1136`	`1136`	`Connection *conn = get_connection_verify_no_ssl(session_id);`
`1137`	`1137`	`#ifdef SW_USE_OPENSSL`
`1138`	`1138`	`if (conn && conn->ssl && !conn->ssl_ready) {`
`1139`		`- swoole_error_log(SW_LOG_NOTICE, SW_ERROR_SSL_NOT_READY, "SSL not ready");`
`1140`	`1139`	`return nullptr;`
`1141`	`1140`	`}`
`1142`	`1141`	`#endif`