Fossil SCM

Defer decoding POST parameters until after the webpage name is located. Do not do the decode if the webpage has the new "raw-content" property. Set that property on /ext so that is can relay the encoded content to sub-cgi.

drh 2019-07-25 18:34 UTC extension-cgi
Commit e4849f58e467b68aa107d7ae7c2ee6e55fd89cafde6eff2c69439c576a277222
Parent cc21a4389e1c1c7…
5 files changed +20 -12 +1 +1 -1 +3 +3
~ src/cgi.c ~ src/dispatch.c ~ src/extcgi.c ~ src/main.c ~ src/mkindex.c
M src/cgi.c
+20 -12
--- src/cgi.c
+++ src/cgi.c
@@ -986,22 +986,11 @@
986986
987987
 len = atoi(PD("CONTENT_LENGTH", "0"));
988988
 g.zContentType = zType = P("CONTENT_TYPE");
989989
 blob_zero(&g.cgiIn);
990990
 if( len>0 && zType ){
991
- if( fossil_strcmp(zType,"application/x-www-form-urlencoded")==0
992
- || strncmp(zType,"multipart/form-data",19)==0 ){
993
- z = fossil_malloc( len+1 );
994
- len = fread(z, 1, len, g.httpIn);
995
- z[len] = 0;
996
- cgi_trace(z);
997
- if( zType[0]=='a' ){
998
- add_param_list(z, '&');
999
- }else{
1000
- process_multipart_form_data(z, len);
1001
- }
1002
- }else if( fossil_strcmp(zType, "application/x-fossil")==0 ){
991
+ if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1003992
 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1004993
 blob_uncompress(&g.cgiIn, &g.cgiIn);
1005994
 }
1006995
 #ifdef FOSSIL_ENABLE_JSON
1007996
 else if( fossil_strcmp(zType, "application/json")
@@ -1029,11 +1018,30 @@
10291018
 #endif /* FOSSIL_ENABLE_JSON */
10301019
 else{
10311020
 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
10321021
 }
10331022
 }
1023
+}
10341024
1025
+/*
1026
+** Decode POST parameter information in the cgiIn content, if any.
1027
+*/
1028
+void cgi_decode_post_parameters(void){
1029
+ int len = blob_size(&g.cgiIn);
1030
+ if( len==0 ) return;
1031
+ if( fossil_strcmp(g.zContentType,"application/x-www-form-urlencoded")==0
1032
+ || strncmp(g.zContentType,"multipart/form-data",19)==0
1033
+ ){
1034
+ char *z = blob_str(&g.cgiIn);
1035
+ cgi_trace(z);
1036
+ if( g.zContentType[0]=='a' ){
1037
+ add_param_list(z, '&');
1038
+ }else{
1039
+ process_multipart_form_data(z, len);
1040
+ }
1041
+ }
1042
+ blob_init(&g.cgiIn, 0, 0);
10351043
 }
10361044
10371045
 /*
10381046
 ** This is the comparison function used to sort the aParamQP[] array of
10391047
 ** query parameters and cookies.
10401048
--- src/cgi.c
+++ src/cgi.c
@@ -986,22 +986,11 @@
986
987 len = atoi(PD("CONTENT_LENGTH", "0"));
988 g.zContentType = zType = P("CONTENT_TYPE");
989 blob_zero(&g.cgiIn);
990 if( len>0 && zType ){
991 if( fossil_strcmp(zType,"application/x-www-form-urlencoded")==0
992 || strncmp(zType,"multipart/form-data",19)==0 ){
993 z = fossil_malloc( len+1 );
994 len = fread(z, 1, len, g.httpIn);
995 z[len] = 0;
996 cgi_trace(z);
997 if( zType[0]=='a' ){
998 add_param_list(z, '&');
999 }else{
1000 process_multipart_form_data(z, len);
1001 }
1002 }else if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1003 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1004 blob_uncompress(&g.cgiIn, &g.cgiIn);
1005 }
1006 #ifdef FOSSIL_ENABLE_JSON
1007 else if( fossil_strcmp(zType, "application/json")
@@ -1029,11 +1018,30 @@
1029 #endif /* FOSSIL_ENABLE_JSON */
1030 else{
1031 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1032 }
1033 }
 
1034
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1035 }
1036
1037 /*
1038 ** This is the comparison function used to sort the aParamQP[] array of
1039 ** query parameters and cookies.
1040
--- src/cgi.c
+++ src/cgi.c
@@ -986,22 +986,11 @@
986
987 len = atoi(PD("CONTENT_LENGTH", "0"));
988 g.zContentType = zType = P("CONTENT_TYPE");
989 blob_zero(&g.cgiIn);
990 if( len>0 && zType ){
991 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
 
 
 
 
 
 
 
 
 
 
 
992 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
993 blob_uncompress(&g.cgiIn, &g.cgiIn);
994 }
995 #ifdef FOSSIL_ENABLE_JSON
996 else if( fossil_strcmp(zType, "application/json")
@@ -1029,11 +1018,30 @@
1018 #endif /* FOSSIL_ENABLE_JSON */
1019 else{
1020 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1021 }
1022 }
1023 }
1024
1025 /*
1026 ** Decode POST parameter information in the cgiIn content, if any.
1027 */
1028 void cgi_decode_post_parameters(void){
1029 int len = blob_size(&g.cgiIn);
1030 if( len==0 ) return;
1031 if( fossil_strcmp(g.zContentType,"application/x-www-form-urlencoded")==0
1032 || strncmp(g.zContentType,"multipart/form-data",19)==0
1033 ){
1034 char *z = blob_str(&g.cgiIn);
1035 cgi_trace(z);
1036 if( g.zContentType[0]=='a' ){
1037 add_param_list(z, '&');
1038 }else{
1039 process_multipart_form_data(z, len);
1040 }
1041 }
1042 blob_init(&g.cgiIn, 0, 0);
1043 }
1044
1045 /*
1046 ** This is the comparison function used to sort the aParamQP[] array of
1047 ** query parameters and cookies.
1048
M src/dispatch.c
+1
--- src/dispatch.c
+++ src/dispatch.c
@@ -47,10 +47,11 @@
4747
 #define CMDFLAG_COMMAND 0x0010 /* A command */
4848
 #define CMDFLAG_SETTING 0x0020 /* A setting */
4949
 #define CMDFLAG_VERSIONABLE 0x0040 /* A versionable setting */
5050
 #define CMDFLAG_BLOCKTEXT 0x0080 /* Multi-line text setting */
5151
 #define CMDFLAG_BOOLEAN 0x0100 /* A boolean setting */
52
+#define CMDFLAG_RAWCONTENT 0x0200 /* Do not interpret POST content */
5253
 /**************************************************************************/
5354
5455
 /* Values for the 2nd parameter to dispatch_name_search() */
5556
 #define CMDFLAG_ANY 0x0038 /* Match anything */
5657
 #define CMDFLAG_PREFIX 0x0200 /* Prefix match is ok */
5758
--- src/dispatch.c
+++ src/dispatch.c
@@ -47,10 +47,11 @@
47 #define CMDFLAG_COMMAND 0x0010 /* A command */
48 #define CMDFLAG_SETTING 0x0020 /* A setting */
49 #define CMDFLAG_VERSIONABLE 0x0040 /* A versionable setting */
50 #define CMDFLAG_BLOCKTEXT 0x0080 /* Multi-line text setting */
51 #define CMDFLAG_BOOLEAN 0x0100 /* A boolean setting */
 
52 /**************************************************************************/
53
54 /* Values for the 2nd parameter to dispatch_name_search() */
55 #define CMDFLAG_ANY 0x0038 /* Match anything */
56 #define CMDFLAG_PREFIX 0x0200 /* Prefix match is ok */
57
--- src/dispatch.c
+++ src/dispatch.c
@@ -47,10 +47,11 @@
47 #define CMDFLAG_COMMAND 0x0010 /* A command */
48 #define CMDFLAG_SETTING 0x0020 /* A setting */
49 #define CMDFLAG_VERSIONABLE 0x0040 /* A versionable setting */
50 #define CMDFLAG_BLOCKTEXT 0x0080 /* Multi-line text setting */
51 #define CMDFLAG_BOOLEAN 0x0100 /* A boolean setting */
52 #define CMDFLAG_RAWCONTENT 0x0200 /* Do not interpret POST content */
53 /**************************************************************************/
54
55 /* Values for the 2nd parameter to dispatch_name_search() */
56 #define CMDFLAG_ANY 0x0038 /* Match anything */
57 #define CMDFLAG_PREFIX 0x0200 /* Prefix match is ok */
58
M src/extcgi.c
+1 -1
--- src/extcgi.c
+++ src/extcgi.c
@@ -74,11 +74,11 @@
7474
 "SERVER_PORT",
7575
 "SERVER_PROTOCOL",
7676
 };
7777
7878
 /*
79
-** WEBPAGE: ext
79
+** WEBPAGE: ext raw-content
8080
 **
8181
 ** Relay an HTTP request to secondary CGI after first checking the
8282
 ** login credentials and setting auxiliary environment variables
8383
 ** so that the secondary CGI can be aware of the credentials and
8484
 ** capabilities of the Fossil user.
8585
--- src/extcgi.c
+++ src/extcgi.c
@@ -74,11 +74,11 @@
74 "SERVER_PORT",
75 "SERVER_PROTOCOL",
76 };
77
78 /*
79 ** WEBPAGE: ext
80 **
81 ** Relay an HTTP request to secondary CGI after first checking the
82 ** login credentials and setting auxiliary environment variables
83 ** so that the secondary CGI can be aware of the credentials and
84 ** capabilities of the Fossil user.
85
--- src/extcgi.c
+++ src/extcgi.c
@@ -74,11 +74,11 @@
74 "SERVER_PORT",
75 "SERVER_PROTOCOL",
76 };
77
78 /*
79 ** WEBPAGE: ext raw-content
80 **
81 ** Relay an HTTP request to secondary CGI after first checking the
82 ** login credentials and setting auxiliary environment variables
83 ** so that the secondary CGI can be aware of the credentials and
84 ** capabilities of the Fossil user.
85
M src/main.c
+3
--- src/main.c
+++ src/main.c
@@ -1784,10 +1784,13 @@
17841784
 @ <h1>Server Configuration Error</h1>
17851785
 @ <p>The database schema on the server is out-of-date. Please ask
17861786
 @ the administrator to run <b>fossil rebuild</b>.</p>
17871787
 }
17881788
 }else{
1789
+ if( (pCmd->eCmdFlags & CMDFLAG_RAWCONTENT)==0 ){
1790
+ cgi_decode_post_parameters();
1791
+ }
17891792
 if( g.fCgiTrace ){
17901793
 fossil_trace("######## Calling %s #########\n", pCmd->zName);
17911794
 cgi_print_all(1, 1);
17921795
 }
17931796
 #ifdef FOSSIL_ENABLE_TH1_HOOKS
17941797
--- src/main.c
+++ src/main.c
@@ -1784,10 +1784,13 @@
1784 @ <h1>Server Configuration Error</h1>
1785 @ <p>The database schema on the server is out-of-date. Please ask
1786 @ the administrator to run <b>fossil rebuild</b>.</p>
1787 }
1788 }else{
 
 
 
1789 if( g.fCgiTrace ){
1790 fossil_trace("######## Calling %s #########\n", pCmd->zName);
1791 cgi_print_all(1, 1);
1792 }
1793 #ifdef FOSSIL_ENABLE_TH1_HOOKS
1794
--- src/main.c
+++ src/main.c
@@ -1784,10 +1784,13 @@
1784 @ <h1>Server Configuration Error</h1>
1785 @ <p>The database schema on the server is out-of-date. Please ask
1786 @ the administrator to run <b>fossil rebuild</b>.</p>
1787 }
1788 }else{
1789 if( (pCmd->eCmdFlags & CMDFLAG_RAWCONTENT)==0 ){
1790 cgi_decode_post_parameters();
1791 }
1792 if( g.fCgiTrace ){
1793 fossil_trace("######## Calling %s #########\n", pCmd->zName);
1794 cgi_print_all(1, 1);
1795 }
1796 #ifdef FOSSIL_ENABLE_TH1_HOOKS
1797
M src/mkindex.c
+3
--- src/mkindex.c
+++ src/mkindex.c
@@ -89,10 +89,11 @@
8989
 #define CMDFLAG_COMMAND 0x0010 /* A command */
9090
 #define CMDFLAG_SETTING 0x0020 /* A setting */
9191
 #define CMDFLAG_VERSIONABLE 0x0040 /* A versionable setting */
9292
 #define CMDFLAG_BLOCKTEXT 0x0080 /* Multi-line text setting */
9393
 #define CMDFLAG_BOOLEAN 0x0100 /* A boolean setting */
94
+#define CMDFLAG_RAWCONTENT 0x0200 /* Do not interpret webpage content */
9495
 /**************************************************************************/
9596
9697
 /*
9798
 ** Each entry looks like this:
9899
 */
@@ -236,10 +237,12 @@
236237
 aEntry[nUsed].eType &= ~(CMDFLAG_1ST_TIER|CMDFLAG_TEST);
237238
 aEntry[nUsed].eType |= CMDFLAG_2ND_TIER;
238239
 }else if( j==4 && strncmp(&zLine[i], "test", j)==0 ){
239240
 aEntry[nUsed].eType &= ~(CMDFLAG_1ST_TIER|CMDFLAG_2ND_TIER);
240241
 aEntry[nUsed].eType |= CMDFLAG_TEST;
242
+ }else if( j==11 && strncmp(&zLine[i], "raw-content", j)==0 ){
243
+ aEntry[nUsed].eType |= CMDFLAG_RAWCONTENT;
241244
 }else if( j==7 && strncmp(&zLine[i], "boolean", j)==0 ){
242245
 aEntry[nUsed].eType &= ~(CMDFLAG_BLOCKTEXT);
243246
 aEntry[nUsed].iWidth = 0;
244247
 aEntry[nUsed].eType |= CMDFLAG_BOOLEAN;
245248
 }else if( j==10 && strncmp(&zLine[i], "block-text", j)==0 ){
246249
--- src/mkindex.c
+++ src/mkindex.c
@@ -89,10 +89,11 @@
89 #define CMDFLAG_COMMAND 0x0010 /* A command */
90 #define CMDFLAG_SETTING 0x0020 /* A setting */
91 #define CMDFLAG_VERSIONABLE 0x0040 /* A versionable setting */
92 #define CMDFLAG_BLOCKTEXT 0x0080 /* Multi-line text setting */
93 #define CMDFLAG_BOOLEAN 0x0100 /* A boolean setting */
 
94 /**************************************************************************/
95
96 /*
97 ** Each entry looks like this:
98 */
@@ -236,10 +237,12 @@
236 aEntry[nUsed].eType &= ~(CMDFLAG_1ST_TIER|CMDFLAG_TEST);
237 aEntry[nUsed].eType |= CMDFLAG_2ND_TIER;
238 }else if( j==4 && strncmp(&zLine[i], "test", j)==0 ){
239 aEntry[nUsed].eType &= ~(CMDFLAG_1ST_TIER|CMDFLAG_2ND_TIER);
240 aEntry[nUsed].eType |= CMDFLAG_TEST;
 
 
241 }else if( j==7 && strncmp(&zLine[i], "boolean", j)==0 ){
242 aEntry[nUsed].eType &= ~(CMDFLAG_BLOCKTEXT);
243 aEntry[nUsed].iWidth = 0;
244 aEntry[nUsed].eType |= CMDFLAG_BOOLEAN;
245 }else if( j==10 && strncmp(&zLine[i], "block-text", j)==0 ){
246
--- src/mkindex.c
+++ src/mkindex.c
@@ -89,10 +89,11 @@
89 #define CMDFLAG_COMMAND 0x0010 /* A command */
90 #define CMDFLAG_SETTING 0x0020 /* A setting */
91 #define CMDFLAG_VERSIONABLE 0x0040 /* A versionable setting */
92 #define CMDFLAG_BLOCKTEXT 0x0080 /* Multi-line text setting */
93 #define CMDFLAG_BOOLEAN 0x0100 /* A boolean setting */
94 #define CMDFLAG_RAWCONTENT 0x0200 /* Do not interpret webpage content */
95 /**************************************************************************/
96
97 /*
98 ** Each entry looks like this:
99 */
@@ -236,10 +237,12 @@
237 aEntry[nUsed].eType &= ~(CMDFLAG_1ST_TIER|CMDFLAG_TEST);
238 aEntry[nUsed].eType |= CMDFLAG_2ND_TIER;
239 }else if( j==4 && strncmp(&zLine[i], "test", j)==0 ){
240 aEntry[nUsed].eType &= ~(CMDFLAG_1ST_TIER|CMDFLAG_2ND_TIER);
241 aEntry[nUsed].eType |= CMDFLAG_TEST;
242 }else if( j==11 && strncmp(&zLine[i], "raw-content", j)==0 ){
243 aEntry[nUsed].eType |= CMDFLAG_RAWCONTENT;
244 }else if( j==7 && strncmp(&zLine[i], "boolean", j)==0 ){
245 aEntry[nUsed].eType &= ~(CMDFLAG_BLOCKTEXT);
246 aEntry[nUsed].iWidth = 0;
247 aEntry[nUsed].eType |= CMDFLAG_BOOLEAN;
248 }else if( j==10 && strncmp(&zLine[i], "block-text", j)==0 ){
249

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button