Fossil SCM

Cherry-pick from branch 'cgi-compliance' (and thus back out [5bb921dd0893a548]). Adapt the computation of g.zUrlSuffix in <code>set_base_url()</code> accordingly.

george 2022-02-13 01:35 base-href-fix
Commit 5c649c7e0f4cdb07c02046a6002b81af53a4905dd09a36420adadc950035e72f
Parent 87fba73120dec00…
3 files changed +19 -5 +1 -4 +1 -4
~ src/cgi.c ~ src/main.c ~ src/main.c
M src/cgi.c
+19 -5
--- src/cgi.c
+++ src/cgi.c
@@ -1174,10 +1174,14 @@
11741174
 **
11751175
 ** REQUEST_URI, PATH_INFO, and SCRIPT_NAME are related as follows:
11761176
 **
11771177
 ** REQUEST_URI == SCRIPT_NAME + PATH_INFO
11781178
 **
1179
+** Or if QUERY_STRING is not empty:
1180
+**
1181
+** REQUEST_URI == SCRIPT_NAME + PATH_INFO + '?' + QUERY_STRING
1182
+**
11791183
 ** Where "+" means concatenate. Fossil requires SCRIPT_NAME. If
11801184
 ** REQUEST_URI is provided but PATH_INFO is not, then PATH_INFO is
11811185
 ** computed from REQUEST_URI and SCRIPT_NAME. If PATH_INFO is provided
11821186
 ** but REQUEST_URI is not, then compute REQUEST_URI from PATH_INFO and
11831187
 ** SCRIPT_NAME. If neither REQUEST_URI nor PATH_INFO are provided, then
@@ -1193,12 +1197,12 @@
11931197
 ** PATH_INFO when it is empty.
11941198
 **
11951199
 ** CGI Parameter quick reference:
11961200
 **
11971201
 ** REQUEST_URI
1198
-** _____________|____________
1199
-** / \
1202
+** _____________|________________
1203
+** / \
12001204
 ** https://www.fossil-scm.org/forum/info/12736b30c072551a?t=c
12011205
 ** \________________/\____/\____________________/ \_/
12021206
 ** | | | |
12031207
 ** HTTP_HOST | PATH_INFO QUERY_STRING
12041208
 ** SCRIPT_NAME
@@ -1226,11 +1230,16 @@
12261230
 if( zScriptName==0 ){
12271231
 size_t nRU, nPI;
12281232
 if( zRequestUri==0 || zPathInfo==0 ){
12291233
 malformed_request("missing SCRIPT_NAME"); /* Does not return */
12301234
 }
1231
- nRU = strlen(zRequestUri);
1235
+ z = strchr(zRequestUri,'?');
1236
+ if( z ){
1237
+ nRU = (int)(z - zRequestUri);
1238
+ }else{
1239
+ nRU = strlen(zRequestUri);
1240
+ }
12321241
 nPI = strlen(zPathInfo);
12331242
 if( nRU<nPI ){
12341243
 malformed_request("PATH_INFO is longer than REQUEST_URI");
12351244
 }
12361245
 zScriptName = fossil_strndup(zRequestUri,(int)(nRU-nPI));
@@ -1251,15 +1260,20 @@
12511260
 cgi_replace_parameter("PATH_INFO", zPathInfo);
12521261
 }
12531262
 #endif
12541263
 if( zRequestUri==0 ){
12551264
 const char *z = zPathInfo;
1265
+ const char *zQS = cgi_parameter("QUERY_STRING",0);
12561266
 if( zPathInfo==0 ){
12571267
 malformed_request("missing PATH_INFO and/or REQUEST_URI");
12581268
 }
12591269
 if( z[0]=='/' ) z++;
1260
- zRequestUri = mprintf("%s/%s", zScriptName, z);
1270
+ if( zQS && zQS[0] ){
1271
+ zRequestUri = mprintf("%s/%s?%s", zScriptName, z, zQS);
1272
+ }else{
1273
+ zRequestUri = mprintf("%s/%s", zScriptName, z);
1274
+ }
12611275
 cgi_set_parameter("REQUEST_URI", zRequestUri);
12621276
 }
12631277
 if( zPathInfo==0 ){
12641278
 int i, j;
12651279
 for(i=0; zRequestUri[i]==zScriptName[i] && zRequestUri[i]; i++){}
@@ -1866,14 +1880,14 @@
18661880
 cgi_setenv("REQUEST_METHOD",zToken);
18671881
 zToken = extract_token(z, &z);
18681882
 if( zToken==0 ){
18691883
 malformed_request("malformed URL in HTTP header");
18701884
 }
1885
+ cgi_setenv("REQUEST_URI", zToken);
18711886
 cgi_setenv("SCRIPT_NAME", "");
18721887
 for(i=0; zToken[i] && zToken[i]!='?'; i++){}
18731888
 if( zToken[i] ) zToken[i++] = 0;
1874
- cgi_setenv("REQUEST_URI", zToken);
18751889
 cgi_setenv("PATH_INFO", zToken);
18761890
 cgi_setenv("QUERY_STRING", &zToken[i]);
18771891
 if( zIpAddr==0 ){
18781892
 zIpAddr = cgi_remote_ip(fileno(g.httpIn));
18791893
 }
18801894
--- src/cgi.c
+++ src/cgi.c
@@ -1174,10 +1174,14 @@
1174 **
1175 ** REQUEST_URI, PATH_INFO, and SCRIPT_NAME are related as follows:
1176 **
1177 ** REQUEST_URI == SCRIPT_NAME + PATH_INFO
1178 **
 
 
 
 
1179 ** Where "+" means concatenate. Fossil requires SCRIPT_NAME. If
1180 ** REQUEST_URI is provided but PATH_INFO is not, then PATH_INFO is
1181 ** computed from REQUEST_URI and SCRIPT_NAME. If PATH_INFO is provided
1182 ** but REQUEST_URI is not, then compute REQUEST_URI from PATH_INFO and
1183 ** SCRIPT_NAME. If neither REQUEST_URI nor PATH_INFO are provided, then
@@ -1193,12 +1197,12 @@
1193 ** PATH_INFO when it is empty.
1194 **
1195 ** CGI Parameter quick reference:
1196 **
1197 ** REQUEST_URI
1198 ** _____________|____________
1199 ** / \
1200 ** https://www.fossil-scm.org/forum/info/12736b30c072551a?t=c
1201 ** \________________/\____/\____________________/ \_/
1202 ** | | | |
1203 ** HTTP_HOST | PATH_INFO QUERY_STRING
1204 ** SCRIPT_NAME
@@ -1226,11 +1230,16 @@
1226 if( zScriptName==0 ){
1227 size_t nRU, nPI;
1228 if( zRequestUri==0 || zPathInfo==0 ){
1229 malformed_request("missing SCRIPT_NAME"); /* Does not return */
1230 }
1231 nRU = strlen(zRequestUri);
 
 
 
 
 
1232 nPI = strlen(zPathInfo);
1233 if( nRU<nPI ){
1234 malformed_request("PATH_INFO is longer than REQUEST_URI");
1235 }
1236 zScriptName = fossil_strndup(zRequestUri,(int)(nRU-nPI));
@@ -1251,15 +1260,20 @@
1251 cgi_replace_parameter("PATH_INFO", zPathInfo);
1252 }
1253 #endif
1254 if( zRequestUri==0 ){
1255 const char *z = zPathInfo;
 
1256 if( zPathInfo==0 ){
1257 malformed_request("missing PATH_INFO and/or REQUEST_URI");
1258 }
1259 if( z[0]=='/' ) z++;
1260 zRequestUri = mprintf("%s/%s", zScriptName, z);
 
 
 
 
1261 cgi_set_parameter("REQUEST_URI", zRequestUri);
1262 }
1263 if( zPathInfo==0 ){
1264 int i, j;
1265 for(i=0; zRequestUri[i]==zScriptName[i] && zRequestUri[i]; i++){}
@@ -1866,14 +1880,14 @@
1866 cgi_setenv("REQUEST_METHOD",zToken);
1867 zToken = extract_token(z, &z);
1868 if( zToken==0 ){
1869 malformed_request("malformed URL in HTTP header");
1870 }
 
1871 cgi_setenv("SCRIPT_NAME", "");
1872 for(i=0; zToken[i] && zToken[i]!='?'; i++){}
1873 if( zToken[i] ) zToken[i++] = 0;
1874 cgi_setenv("REQUEST_URI", zToken);
1875 cgi_setenv("PATH_INFO", zToken);
1876 cgi_setenv("QUERY_STRING", &zToken[i]);
1877 if( zIpAddr==0 ){
1878 zIpAddr = cgi_remote_ip(fileno(g.httpIn));
1879 }
1880
--- src/cgi.c
+++ src/cgi.c
@@ -1174,10 +1174,14 @@
1174 **
1175 ** REQUEST_URI, PATH_INFO, and SCRIPT_NAME are related as follows:
1176 **
1177 ** REQUEST_URI == SCRIPT_NAME + PATH_INFO
1178 **
1179 ** Or if QUERY_STRING is not empty:
1180 **
1181 ** REQUEST_URI == SCRIPT_NAME + PATH_INFO + '?' + QUERY_STRING
1182 **
1183 ** Where "+" means concatenate. Fossil requires SCRIPT_NAME. If
1184 ** REQUEST_URI is provided but PATH_INFO is not, then PATH_INFO is
1185 ** computed from REQUEST_URI and SCRIPT_NAME. If PATH_INFO is provided
1186 ** but REQUEST_URI is not, then compute REQUEST_URI from PATH_INFO and
1187 ** SCRIPT_NAME. If neither REQUEST_URI nor PATH_INFO are provided, then
@@ -1193,12 +1197,12 @@
1197 ** PATH_INFO when it is empty.
1198 **
1199 ** CGI Parameter quick reference:
1200 **
1201 ** REQUEST_URI
1202 ** _____________|________________
1203 ** / \
1204 ** https://www.fossil-scm.org/forum/info/12736b30c072551a?t=c
1205 ** \________________/\____/\____________________/ \_/
1206 ** | | | |
1207 ** HTTP_HOST | PATH_INFO QUERY_STRING
1208 ** SCRIPT_NAME
@@ -1226,11 +1230,16 @@
1230 if( zScriptName==0 ){
1231 size_t nRU, nPI;
1232 if( zRequestUri==0 || zPathInfo==0 ){
1233 malformed_request("missing SCRIPT_NAME"); /* Does not return */
1234 }
1235 z = strchr(zRequestUri,'?');
1236 if( z ){
1237 nRU = (int)(z - zRequestUri);
1238 }else{
1239 nRU = strlen(zRequestUri);
1240 }
1241 nPI = strlen(zPathInfo);
1242 if( nRU<nPI ){
1243 malformed_request("PATH_INFO is longer than REQUEST_URI");
1244 }
1245 zScriptName = fossil_strndup(zRequestUri,(int)(nRU-nPI));
@@ -1251,15 +1260,20 @@
1260 cgi_replace_parameter("PATH_INFO", zPathInfo);
1261 }
1262 #endif
1263 if( zRequestUri==0 ){
1264 const char *z = zPathInfo;
1265 const char *zQS = cgi_parameter("QUERY_STRING",0);
1266 if( zPathInfo==0 ){
1267 malformed_request("missing PATH_INFO and/or REQUEST_URI");
1268 }
1269 if( z[0]=='/' ) z++;
1270 if( zQS && zQS[0] ){
1271 zRequestUri = mprintf("%s/%s?%s", zScriptName, z, zQS);
1272 }else{
1273 zRequestUri = mprintf("%s/%s", zScriptName, z);
1274 }
1275 cgi_set_parameter("REQUEST_URI", zRequestUri);
1276 }
1277 if( zPathInfo==0 ){
1278 int i, j;
1279 for(i=0; zRequestUri[i]==zScriptName[i] && zRequestUri[i]; i++){}
@@ -1866,14 +1880,14 @@
1880 cgi_setenv("REQUEST_METHOD",zToken);
1881 zToken = extract_token(z, &z);
1882 if( zToken==0 ){
1883 malformed_request("malformed URL in HTTP header");
1884 }
1885 cgi_setenv("REQUEST_URI", zToken);
1886 cgi_setenv("SCRIPT_NAME", "");
1887 for(i=0; zToken[i] && zToken[i]!='?'; i++){}
1888 if( zToken[i] ) zToken[i++] = 0;
 
1889 cgi_setenv("PATH_INFO", zToken);
1890 cgi_setenv("QUERY_STRING", &zToken[i]);
1891 if( zIpAddr==0 ){
1892 zIpAddr = cgi_remote_ip(fileno(g.httpIn));
1893 }
1894
M src/main.c
+1 -4
--- src/main.c
+++ src/main.c
@@ -1355,11 +1355,10 @@
13551355
 int i;
13561356
 const char *zHost;
13571357
 const char *zMode;
13581358
 const char *zCur;
13591359
 const char *zRU; /* REQUEST_URI */
1360
- const char *zQS; /* QUERY_STRING */
13611360
 size_t nTop; /* length of g.zTop */
13621361
13631362
 if( g.zBaseURL!=0 ) return;
13641363
 if( zAltBase ){
13651364
 int i, n, c;
@@ -1420,13 +1419,11 @@
14201419
14211420
 zRU = PD("REQUEST_URI","");
14221421
 nTop = strlen( g.zTop );
14231422
 g.zUrlSuffix = strncmp(zRU,g.zTop,nTop) ? "" : zRU+nTop;
14241423
 if(g.zUrlSuffix[0]=='/') g.zUrlSuffix++;
1425
- zQS = PD("QUERY_STRING","");
1426
- if( zQS[0] ) g.zUrlSuffix = mprintf("%s?%s", g.zUrlSuffix, zQS);
1427
- else g.zUrlSuffix = mprintf("%s", g.zUrlSuffix);
1424
+ g.zUrlSuffix = fossil_strdup( g.zUrlSuffix );
14281425
14291426
 /* Try to record the base URL as a CONFIG table entry with a name
14301427
 ** of the form: "baseurl:BASE". This keeps a record of how the
14311428
 ** the repository is used as a server, to help in answering questions
14321429
 ** like "where is the CGI script that references this repository?"
14331430
--- src/main.c
+++ src/main.c
@@ -1355,11 +1355,10 @@
1355 int i;
1356 const char *zHost;
1357 const char *zMode;
1358 const char *zCur;
1359 const char *zRU; /* REQUEST_URI */
1360 const char *zQS; /* QUERY_STRING */
1361 size_t nTop; /* length of g.zTop */
1362
1363 if( g.zBaseURL!=0 ) return;
1364 if( zAltBase ){
1365 int i, n, c;
@@ -1420,13 +1419,11 @@
1420
1421 zRU = PD("REQUEST_URI","");
1422 nTop = strlen( g.zTop );
1423 g.zUrlSuffix = strncmp(zRU,g.zTop,nTop) ? "" : zRU+nTop;
1424 if(g.zUrlSuffix[0]=='/') g.zUrlSuffix++;
1425 zQS = PD("QUERY_STRING","");
1426 if( zQS[0] ) g.zUrlSuffix = mprintf("%s?%s", g.zUrlSuffix, zQS);
1427 else g.zUrlSuffix = mprintf("%s", g.zUrlSuffix);
1428
1429 /* Try to record the base URL as a CONFIG table entry with a name
1430 ** of the form: "baseurl:BASE". This keeps a record of how the
1431 ** the repository is used as a server, to help in answering questions
1432 ** like "where is the CGI script that references this repository?"
1433
--- src/main.c
+++ src/main.c
@@ -1355,11 +1355,10 @@
1355 int i;
1356 const char *zHost;
1357 const char *zMode;
1358 const char *zCur;
1359 const char *zRU; /* REQUEST_URI */
 
1360 size_t nTop; /* length of g.zTop */
1361
1362 if( g.zBaseURL!=0 ) return;
1363 if( zAltBase ){
1364 int i, n, c;
@@ -1420,13 +1419,11 @@
1419
1420 zRU = PD("REQUEST_URI","");
1421 nTop = strlen( g.zTop );
1422 g.zUrlSuffix = strncmp(zRU,g.zTop,nTop) ? "" : zRU+nTop;
1423 if(g.zUrlSuffix[0]=='/') g.zUrlSuffix++;
1424 g.zUrlSuffix = fossil_strdup( g.zUrlSuffix );
 
 
1425
1426 /* Try to record the base URL as a CONFIG table entry with a name
1427 ** of the form: "baseurl:BASE". This keeps a record of how the
1428 ** the repository is used as a server, to help in answering questions
1429 ** like "where is the CGI script that references this repository?"
1430
M src/main.c
+1 -4
--- src/main.c
+++ src/main.c
@@ -1355,11 +1355,10 @@
13551355
 int i;
13561356
 const char *zHost;
13571357
 const char *zMode;
13581358
 const char *zCur;
13591359
 const char *zRU; /* REQUEST_URI */
1360
- const char *zQS; /* QUERY_STRING */
13611360
 size_t nTop; /* length of g.zTop */
13621361
13631362
 if( g.zBaseURL!=0 ) return;
13641363
 if( zAltBase ){
13651364
 int i, n, c;
@@ -1420,13 +1419,11 @@
14201419
14211420
 zRU = PD("REQUEST_URI","");
14221421
 nTop = strlen( g.zTop );
14231422
 g.zUrlSuffix = strncmp(zRU,g.zTop,nTop) ? "" : zRU+nTop;
14241423
 if(g.zUrlSuffix[0]=='/') g.zUrlSuffix++;
1425
- zQS = PD("QUERY_STRING","");
1426
- if( zQS[0] ) g.zUrlSuffix = mprintf("%s?%s", g.zUrlSuffix, zQS);
1427
- else g.zUrlSuffix = mprintf("%s", g.zUrlSuffix);
1424
+ g.zUrlSuffix = fossil_strdup( g.zUrlSuffix );
14281425
14291426
 /* Try to record the base URL as a CONFIG table entry with a name
14301427
 ** of the form: "baseurl:BASE". This keeps a record of how the
14311428
 ** the repository is used as a server, to help in answering questions
14321429
 ** like "where is the CGI script that references this repository?"
14331430
--- src/main.c
+++ src/main.c
@@ -1355,11 +1355,10 @@
1355 int i;
1356 const char *zHost;
1357 const char *zMode;
1358 const char *zCur;
1359 const char *zRU; /* REQUEST_URI */
1360 const char *zQS; /* QUERY_STRING */
1361 size_t nTop; /* length of g.zTop */
1362
1363 if( g.zBaseURL!=0 ) return;
1364 if( zAltBase ){
1365 int i, n, c;
@@ -1420,13 +1419,11 @@
1420
1421 zRU = PD("REQUEST_URI","");
1422 nTop = strlen( g.zTop );
1423 g.zUrlSuffix = strncmp(zRU,g.zTop,nTop) ? "" : zRU+nTop;
1424 if(g.zUrlSuffix[0]=='/') g.zUrlSuffix++;
1425 zQS = PD("QUERY_STRING","");
1426 if( zQS[0] ) g.zUrlSuffix = mprintf("%s?%s", g.zUrlSuffix, zQS);
1427 else g.zUrlSuffix = mprintf("%s", g.zUrlSuffix);
1428
1429 /* Try to record the base URL as a CONFIG table entry with a name
1430 ** of the form: "baseurl:BASE". This keeps a record of how the
1431 ** the repository is used as a server, to help in answering questions
1432 ** like "where is the CGI script that references this repository?"
1433
--- src/main.c
+++ src/main.c
@@ -1355,11 +1355,10 @@
1355 int i;
1356 const char *zHost;
1357 const char *zMode;
1358 const char *zCur;
1359 const char *zRU; /* REQUEST_URI */
 
1360 size_t nTop; /* length of g.zTop */
1361
1362 if( g.zBaseURL!=0 ) return;
1363 if( zAltBase ){
1364 int i, n, c;
@@ -1420,13 +1419,11 @@
1419
1420 zRU = PD("REQUEST_URI","");
1421 nTop = strlen( g.zTop );
1422 g.zUrlSuffix = strncmp(zRU,g.zTop,nTop) ? "" : zRU+nTop;
1423 if(g.zUrlSuffix[0]=='/') g.zUrlSuffix++;
1424 g.zUrlSuffix = fossil_strdup( g.zUrlSuffix );
 
 
1425
1426 /* Try to record the base URL as a CONFIG table entry with a name
1427 ** of the form: "baseurl:BASE". This keeps a record of how the
1428 ** the repository is used as a server, to help in answering questions
1429 ** like "where is the CGI script that references this repository?"
1430

Keyboard Shortcuts

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