fix web

modules/HTTP_Server/http_server.c

@@ -705,7 +705,6 @@ char* HTTP_HistoryPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
 {
     uint8_t i, valueLen = 0;
     char value[20];
-    uint32_t nbytes = 0;
 
     (void)lenBufIn;
     (void)reqNum;
@@ -756,7 +755,6 @@ char* HTTP_UpsHistoryPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t l
 {
     uint8_t i, valueLen = 0;
     char value[20];
-    uint32_t nbytes = 0;
 
     (void)lenBufIn;
     (void)reqNum;
@@ -1746,6 +1744,9 @@ char *HTTP_LoginPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBuf
     (void)reqNum;
     uint32_t req_data_received = 0;
     char *offset = 0;
+
+    memset(bufOut, 0, SEND_BUF_MAX_LEN);
+
     //printf("request 1: %d\r\n", lenBufIn);
     if (post_data_count == 0) {
         /* parse packet for Content-length field */
@@ -1779,15 +1780,9 @@ char *HTTP_LoginPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBuf
                     /* End reqest */
                     post_data_count = 0;
                     log_post_reqn = 0;
-                    if (HTTP_ConfirmWebPwd(post_req_data, bufOut, strlen(post_req_data), lenBufOut) == SEND_REQUIRED_YES) {
-                        *lenBufOut = strlen(bufOut);
-                        return bufOut;
-                    } else {
-                        /* Redirect to login page */
-                        fs_open("/login.html", &file);
-                        *lenBufOut = file.len;
-                        return file.data;
-                    }
+                    HTTP_ConfirmWebPwd(post_req_data, bufOut, strlen(post_req_data), lenBufOut);
+                    *lenBufOut = strlen(bufOut);
+                    return bufOut;
                 }
             }
             /* request was fragmented before "\r\n\r\n" */
@@ -1820,15 +1815,9 @@ char *HTTP_LoginPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBuf
         post_data_count = 0;
         log_post_reqn = 0;
 
-        if (HTTP_ConfirmWebPwd(post_req_data, bufOut, strlen(post_req_data), lenBufOut) == SEND_REQUIRED_YES) {
-            *lenBufOut = strlen(bufOut);
-            return bufOut;
-        } else {
-            /* Redirect to login page */
-            fs_open("/login.html", &file);
-            *lenBufOut = file.len;
-            return file.data;
-        }
+        HTTP_ConfirmWebPwd(post_req_data, bufOut, strlen(post_req_data), lenBufOut);
+        *lenBufOut = strlen(bufOut);
+        return bufOut;
     } else {
         /* Redirect to login page */
         fs_open("/login.html", &file);

modules/HTTP_Server/my_ssl_server.c

@@ -929,7 +929,7 @@ char *HTTP_HistoryPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
     (void)lenBufIn;
     (void)reqNum;
 
-    memset(bufOut, 0, FILE_BUF_MAX_LEN);
+    memset(bufOut, 0, SEND_BUF_MAX_LEN);
 
     ClearParamString(bufIn);
 
@@ -984,7 +984,7 @@ char *HTTP_UpsHistoryPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t l
     (void)lenBufIn;
     (void)reqNum;
 
-    memset(bufOut, 0, FILE_BUF_MAX_LEN);
+    memset(bufOut, 0, SEND_BUF_MAX_LEN);
 
     ClearParamString(bufIn);
 
@@ -2086,15 +2086,13 @@ static void getAuthenticatedState(void)
     }
 }
 
-int test = 0;
-
 char *HTTP_LoginPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t *lenBufOut)
 {
     (void)reqNum;
     uint32_t req_data_received = 0;
     char *offset = 0;
 
-     printf("!!!!!!: %d\r\n", test++);
+    memset(bufOut, 0, SEND_BUF_MAX_LEN);
 
     /* parse packet for Content-length field */
     post_data_count = Parse_Content_Length(bufIn, lenBufIn);
@@ -2123,19 +2121,9 @@ char *HTTP_LoginPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBuf
                 //printf("post_req_data: %s\r\n", post_req_data);
                 /* End reqest */
                 post_data_count = 0;
-                if (HTTP_ConfirmWebPwd(post_req_data, bufOut, strlen(post_req_data), lenBufOut) == SEND_REQUIRED_YES) {
-                    *lenBufOut = strlen(bufOut);
-                    return bufOut;
-                } else {
-                    /* Redirect to login page */
-                    if ((sSettings.sRADIUS.RDSEnable == true) && (fl_raddius_net_err == false)) {
-                        fs_open("/rslogin.html", &file);
-                    } else {
-                        fs_open("/login.html", &file);
-                    }
-                    *lenBufOut = file.len;
-                    return file.data;
-                }
+                HTTP_ConfirmWebPwd(post_req_data, bufOut, strlen(post_req_data), lenBufOut);
+                *lenBufOut = strlen(bufOut);
+                return bufOut;
             }
         }
         /* request was fragmented before "\r\n\r\n" */

modules/HTTP_Server/web_params_api.c

@@ -42,8 +42,6 @@ typedef  void (*pFunction)(void);
 pFunction Jump_To_Application;
 uint32_t JumpAddress;
 
-extern uint8_t seclevel;
-
 /**
   * @brief  Возвращяет строку с настройками на первой странице
   * @retval None
@@ -158,10 +156,6 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t
     (void)lenBufIn;
     (void)reqNum;
 
-    if (seclevel == USER) {
-      return 0;
-    }
-
     /* Headers для поддержки saffari */
     strcpy(bufOut, "HTTP/1.0 200 OK\r\nContent-Type:text/html\r\n\r\n");
 
@@ -459,7 +453,7 @@ char *HTTP_GetInfo(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn
             strncat(bufOut, str, len);
         }
 
-        GetOwnerStr(bufOut, &len);
+        GetOwnerStr(str, &len);
         str[len] = 0;
         strcat(bufOut, "\",\"owner\":\"");
         memset(tmp_str, 0, sizeof(tmp_str));