Changeset 4137

Timestamp:

12/17/10 17:58:19 (13 years ago)

Author:

_network

Message:

WebIf: add POST support

Location:

trunk

Files:

• oscam-http-helpers.c (modified) (1 diff)
• oscam-http.c (modified) (7 diffs)
• oscam-http.h (modified) (1 diff)
• oscam.c (modified) (1 diff)

trunk/oscam-http-helpers.c

@@ -390 +390 @@
     } else
 #endif
-    {
-        buf[0]='\0';
-        int len=0;
-        while (fgets(buf+len, num-len-1, f)) {
-            if (buf[0+len] == '\r' && buf[1+len] == '\n') break;
-            len=strlen(buf);
-        }
-        return len;
-    }
+        return read(fileno(f), buf, num);
 }
 

trunk/oscam-http.c

@@ -2559 +2559 @@
 }
 
+void webif_parse_request(struct uriparams *params, char *pch) {
+    /* Parse url parameters; parsemode = 1 means parsing next param, parsemode = -1 parsing next
+     value; pch2 points to the beginning of the currently parsed string, pch is the current position */
+
+    char *pch2;
+    int parsemode = 1;
+
+    pch2=pch;
+    while(pch[0] != '\0') {
+        if((parsemode == 1 && pch[0] == '=') || (parsemode == -1 && pch[0] == '&')) {
+            pch[0] = '\0';
+            urldecode(pch2);
+            if(parsemode == 1) {
+                if(params->paramcount >= MAXGETPARAMS) break;
+                ++params->paramcount;
+                params->params[params->paramcount-1] = pch2;
+            } else {
+                params->values[params->paramcount-1] = pch2;
+            }
+            parsemode = -parsemode;
+            pch2 = pch + 1;
+        }
+        ++pch;
+    }
+    /* last value wasn't processed in the loop yet... */
+    if(parsemode == -1 && params->paramcount <= MAXGETPARAMS) {
+        urldecode(pch2);
+        params->values[params->paramcount-1] = pch2;
+    }
+}
+
 int process_request(FILE *f, struct in_addr in) {
 
@@ -2621 +2652 @@
     }
 
-    char buf[4096];
+    char buf[10240];
     char *tmp;
 
@@ -2631 +2662 @@
     char *protocol;
     char *pch;
-    char *pch2;
     /* List of possible pages */
     char *pages[]= {
@@ -2658 +2688 @@
     int pgidx = -1;
     int i;
-    int parsemode = 1;
     struct uriparams params;
     params.paramcount = 0;
@@ -2665 +2694 @@
     char *saveptr1=NULL;
     int n;
-    if ((n=webif_read(buf, sizeof(buf), f)) <= 0) {
+    if ((n=webif_read(buf, sizeof(buf)-1, f)) <= 0) {
         cs_debug("webif read error %d", n);
         return -1;
     }
+    buf[n]='\0';
 
     method = strtok_r(buf, " ", &saveptr1);
@@ -2689 +2719 @@
     }
 
-    /* Parse url parameters; parsemode = 1 means parsing next param, parsemode = -1 parsing next
-     value; pch2 points to the beginning of the currently parsed string, pch is the current position */
-    pch2=pch;
-    while(pch[0] != '\0') {
-        if((parsemode == 1 && pch[0] == '=') || (parsemode == -1 && pch[0] == '&')) {
-            pch[0] = '\0';
-            urldecode(pch2);
-            if(parsemode == 1) {
-                if(params.paramcount >= MAXGETPARAMS) break;
-                ++params.paramcount;
-                params.params[params.paramcount-1] = pch2;
-            } else {
-                params.values[params.paramcount-1] = pch2;
-            }
-            parsemode = -parsemode;
-            pch2 = pch + 1;
-        }
-        ++pch;
-    }
-    /* last value wasn't processed in the loop yet... */
-    if(parsemode == -1 && params.paramcount <= MAXGETPARAMS) {
-        urldecode(pch2);
-        params.values[params.paramcount-1] = pch2;
-    }
+    webif_parse_request(&params, pch);
 
     if(strlen(cfg->http_user) == 0 || strlen(cfg->http_pwd) == 0) authok = 1;
@@ -2718 +2725 @@
 
     char *str1, *saveptr=NULL;
+
     for (str1=strtok_r(tmp, "\n", &saveptr); str1; str1=strtok_r(NULL, "\n", &saveptr)) {
-        if (str1[0] == '\r' && str1[1] == '\n') break;
-        else if(authok == 0 && strlen(str1) > 50 && strncmp(str1, "Authorization:", 14) == 0 && strstr(str1, "Digest") != NULL) {
+        if (strlen(str1)==1) {
+            if (strcmp(method, "POST")==0) {
+                webif_parse_request(&params, str1+2);
+            }
+            break;
+        }
+        if(authok == 0 && strlen(str1) > 50 && strncmp(str1, "Authorization:", 14) == 0 && strstr(str1, "Digest") != NULL) {
             authok = check_auth(str1, method, path, expectednonce);
         }

trunk/oscam-http.h

@@ -318 +318 @@
   ##TPLFILEMENU##\n\
   <BR><BR>##SDEBUG####SLOG####SCLEAR##<BR>##FILTER##\n\
-  <FORM ACTION=\"files.html\" method=\"get\">\n\
+  <FORM ACTION=\"files.html\" method=\"post\">\n\
   <INPUT TYPE=\"hidden\" NAME=\"part\" VALUE=\"##PART##\">\n\
   <TEXTAREA NAME=\"filecontent\" CLASS=\"editor\">##FILECONTENT##</TEXTAREA><BR>##WRITEPROTECTION##<BR>\n\

trunk/oscam.c

@@ -3123 +3123 @@
                 break;
           case 'x':
+#ifdef COOL
                 cooldebug = 1;
+#endif
                 break;
           case 'h':