Fossil SCM

Add hooks in the HTTP request decoder and reply generator that allow us to redirect traffic through an SSL codec.

drh 2021-12-26 13:53 trunk
Commit 5674f776e9f03efe9d2dd10b6185b29888f9b6f166c87e04a50d45e70d5dfba9
Parent 37ccaafddb2bd4e…
3 files changed +30 -1 +83 -8 +1
~ src/blob.c ~ src/cgi.c ~ src/main.c
M src/blob.c
+30 -1
--- src/blob.c
+++ src/blob.c
@@ -17,11 +17,16 @@
1717
 **
1818
 ** A Blob is a variable-length containers for arbitrary string
1919
 ** or binary data.
2020
 */
2121
 #include "config.h"
22
-#include <zlib.h>
22
+#if defined(FOSSIL_ENABLE_MINIZ)
23
+# define MINIZ_HEADER_FILE_ONLY
24
+# include "miniz.c"
25
+#else
26
+# include <zlib.h>
27
+#endif
2328
 #include "blob.h"
2429
 #if defined(_WIN32)
2530
 #include <fcntl.h>
2631
 #include <io.h>
2732
 #endif
@@ -967,10 +972,34 @@
967972
 }
968973
 }else{
969974
 blob_resize(pBlob, nToRead);
970975
 n = fread(blob_buffer(pBlob), 1, nToRead, in);
971976
 blob_resize(pBlob, n);
977
+ }
978
+ return blob_size(pBlob);
979
+}
980
+
981
+/*
982
+** Initialize a blob to the data read from HTTP input. Return
983
+** the number of bytes read into the blob. Any prior content
984
+** of the blob is discarded, not freed.
985
+*/
986
+int blob_read_from_cgi(Blob *pBlob, int nToRead){
987
+ size_t n;
988
+ blob_zero(pBlob);
989
+ if( nToRead<0 ){
990
+ char zBuf[10000];
991
+ while( !cgi_feof() ){
992
+ n = cgi_fread(zBuf, sizeof(zBuf));
993
+ if( n>0 ){
994
+ blob_append(pBlob, zBuf, n);
995
+ }
996
+ }
997
+ }else{
998
+ blob_resize(pBlob, nToRead);
999
+ n = cgi_fread(blob_buffer(pBlob), nToRead);
1000
+ blob_resize(pBlob, n);
9721001
 }
9731002
 return blob_size(pBlob);
9741003
 }
9751004
9761005
 /*
9771006
--- src/blob.c
+++ src/blob.c
@@ -17,11 +17,16 @@
17 **
18 ** A Blob is a variable-length containers for arbitrary string
19 ** or binary data.
20 */
21 #include "config.h"
22 #include <zlib.h>
 
 
 
 
 
23 #include "blob.h"
24 #if defined(_WIN32)
25 #include <fcntl.h>
26 #include <io.h>
27 #endif
@@ -967,10 +972,34 @@
967 }
968 }else{
969 blob_resize(pBlob, nToRead);
970 n = fread(blob_buffer(pBlob), 1, nToRead, in);
971 blob_resize(pBlob, n);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
972 }
973 return blob_size(pBlob);
974 }
975
976 /*
977
--- src/blob.c
+++ src/blob.c
@@ -17,11 +17,16 @@
17 **
18 ** A Blob is a variable-length containers for arbitrary string
19 ** or binary data.
20 */
21 #include "config.h"
22 #if defined(FOSSIL_ENABLE_MINIZ)
23 # define MINIZ_HEADER_FILE_ONLY
24 # include "miniz.c"
25 #else
26 # include <zlib.h>
27 #endif
28 #include "blob.h"
29 #if defined(_WIN32)
30 #include <fcntl.h>
31 #include <io.h>
32 #endif
@@ -967,10 +972,34 @@
972 }
973 }else{
974 blob_resize(pBlob, nToRead);
975 n = fread(blob_buffer(pBlob), 1, nToRead, in);
976 blob_resize(pBlob, n);
977 }
978 return blob_size(pBlob);
979 }
980
981 /*
982 ** Initialize a blob to the data read from HTTP input. Return
983 ** the number of bytes read into the blob. Any prior content
984 ** of the blob is discarded, not freed.
985 */
986 int blob_read_from_cgi(Blob *pBlob, int nToRead){
987 size_t n;
988 blob_zero(pBlob);
989 if( nToRead<0 ){
990 char zBuf[10000];
991 while( !cgi_feof() ){
992 n = cgi_fread(zBuf, sizeof(zBuf));
993 if( n>0 ){
994 blob_append(pBlob, zBuf, n);
995 }
996 }
997 }else{
998 blob_resize(pBlob, nToRead);
999 n = cgi_fread(blob_buffer(pBlob), nToRead);
1000 blob_resize(pBlob, n);
1001 }
1002 return blob_size(pBlob);
1003 }
1004
1005 /*
1006
M src/cgi.c
+83 -8
--- src/cgi.c
+++ src/cgi.c
@@ -84,10 +84,11 @@
8484
 #endif
8585
 #include <time.h>
8686
 #include <stdio.h>
8787
 #include <stdlib.h>
8888
 #include <unistd.h>
89
+#include <assert.h>
8990
 #include "cgi.h"
9091
 #include "cygsup.h"
9192
9293
 #if INTERFACE
9394
 /*
@@ -333,10 +334,79 @@
333334
 if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
334335
 return strncmp(zContentType, "text/", 5)==0
335336
 || sqlite3_strglob("application/*xml", zContentType)==0
336337
 || sqlite3_strglob("application/*javascript", zContentType)==0;
337338
 }
339
+
340
+
341
+/*
342
+** The following routines read or write content from/to the wire for
343
+** an HTTP request. Depending on settings the content might be coming
344
+** from or going to a socket, or a file, or it might come from or go
345
+** to an SSL decoder/encoder.
346
+*/
347
+/*
348
+** Works like fgets():
349
+**
350
+** Read a single line of input into s[]. Ensure that s[] is zero-terminated.
351
+** The s[] buffer is size bytes and so at most size-1 bytes will be read.
352
+**
353
+** Return a pointer to s[] on success, or NULL at end-of-input.
354
+*/
355
+static char *cgi_fgets(char *s, int size){
356
+ if( !g.httpUseSSL ){
357
+ return fgets(s, size, g.httpIn);
358
+ }
359
+ assert( !"SSL Server not yet implemented" );
360
+}
361
+
362
+/* Works like fread():
363
+**
364
+** Read as many as bytes of content as we can, up to a maximum of nmemb
365
+** bytes. Return the number of bytes read. Return -1 if there is no
366
+** further input or if an I/O error occurs.
367
+*/
368
+size_t cgi_fread(void *ptr, size_t nmemb){
369
+ if( !g.httpUseSSL ){
370
+ return fread(ptr, 1, nmemb, g.httpIn);
371
+ }
372
+ assert( !"SSL Server not yet implemented" );
373
+}
374
+
375
+/* Works like feof():
376
+**
377
+** Return true if end-of-input has been reached.
378
+*/
379
+int cgi_feof(void){
380
+ if( !g.httpUseSSL ){
381
+ return feof(g.httpIn);
382
+ }
383
+ assert( !"SSL Server not yet implemented" );
384
+}
385
+
386
+/* Works like fwrite():
387
+**
388
+** Try to output nmemb bytes of content. Return the number of
389
+** bytes actually written.
390
+*/
391
+static size_t cgi_fwrite(void *ptr, size_t nmemb){
392
+ if( !g.httpUseSSL ){
393
+ return fwrite(ptr, 1, nmemb, g.httpOut);
394
+ }
395
+ assert( !"SSL Server not yet implemented" );
396
+}
397
+
398
+/* Works like fflush():
399
+**
400
+** Make sure I/O has completed.
401
+*/
402
+static void cgi_fflush(void){
403
+ if( !g.httpUseSSL ){
404
+ fflush(g.httpOut);
405
+ }
406
+}
407
+
338408
339409
 /*
340410
 ** Generate the reply to a web request. The output might be an
341411
 ** full HTTP response, or a CGI response, depending on how things have
342412
 ** be set up.
@@ -436,11 +506,11 @@
436506
 blob_appendf(&hdr, "Content-Length: %d\r\n", total_size);
437507
 }else{
438508
 total_size = 0;
439509
 }
440510
 blob_appendf(&hdr, "\r\n");
441
- fwrite(blob_buffer(&hdr), 1, blob_size(&hdr), g.httpOut);
511
+ cgi_fwrite(blob_buffer(&hdr), blob_size(&hdr));
442512
 blob_reset(&hdr);
443513
 if( total_size>0
444514
 && iReplyStatus!=304
445515
 && fossil_strcmp(P("REQUEST_METHOD"),"HEAD")!=0
446516
 ){
@@ -452,17 +522,17 @@
452522
 }else{
453523
 int n = size - rangeStart;
454524
 if( n>total_size ){
455525
 n = total_size;
456526
 }
457
- fwrite(blob_buffer(&cgiContent[i])+rangeStart, 1, n, g.httpOut);
527
+ cgi_fwrite(blob_buffer(&cgiContent[i])+rangeStart, n);
458528
 rangeStart = 0;
459529
 total_size -= n;
460530
 }
461531
 }
462532
 }
463
- fflush(g.httpOut);
533
+ cgi_fflush();
464534
 CGIDEBUG(("-------- END cgi ---------\n"));
465535
466536
 /* After the webpage has been sent, do any useful background
467537
 ** processing.
468538
 */
@@ -1262,18 +1332,19 @@
12621332
 g.zContentType = zType;
12631333
 }
12641334
 blob_zero(&g.cgiIn);
12651335
 if( len>0 && zType ){
12661336
 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1267
- if( blob_read_from_channel(&g.cgiIn, g.httpIn, len)!=len ){
1337
+ if( blob_read_from_cgi(&g.cgiIn, len)!=len ){
12681338
 malformed_request("CGI content-length mismatch");
12691339
 }
12701340
 blob_uncompress(&g.cgiIn, &g.cgiIn);
12711341
 }
12721342
 #ifdef FOSSIL_ENABLE_JSON
1273
- else if( noJson==0 && g.json.isJsonMode!=0
1343
+ else if( noJson==0 && g.json.isJsonMode!=0
12741344
 && json_can_consume_content_type(zType)!=0 ){
1345
+ assert( !g.httpUseSSL );
12751346
 cgi_parse_POST_JSON(g.httpIn, (unsigned int)len);
12761347
 /*
12771348
 Potential TODOs:
12781349
12791350
 1) If parsing fails, immediately return an error response
@@ -1281,11 +1352,11 @@
12811352
 */
12821353
 cgi_set_content_type(json_guess_content_type());
12831354
 }
12841355
 #endif /* FOSSIL_ENABLE_JSON */
12851356
 else{
1286
- blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1357
+ blob_read_from_cgi(&g.cgiIn, len);
12871358
 }
12881359
 }
12891360
 }
12901361
12911362
 /*
@@ -1799,11 +1870,11 @@
17991870
 char *z, *zToken;
18001871
 int i;
18011872
 const char *zScheme = "http";
18021873
 char zLine[2000]; /* A single line of input. */
18031874
 g.fullHttpReply = 1;
1804
- if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
1875
+ if( cgi_fgets(zLine, sizeof(zLine))==0 ){
18051876
 malformed_request("missing HTTP header");
18061877
 }
18071878
 blob_append(&g.httpHeader, zLine, -1);
18081879
 cgi_trace(zLine);
18091880
 zToken = extract_token(zLine, &z);
@@ -1837,11 +1908,11 @@
18371908
 }
18381909
18391910
18401911
 /* Get all the optional fields that follow the first line.
18411912
 */
1842
- while( fgets(zLine,sizeof(zLine),g.httpIn) ){
1913
+ while( cgi_fgets(zLine,sizeof(zLine)) ){
18431914
 char *zFieldName;
18441915
 char *zVal;
18451916
18461917
 cgi_trace(zLine);
18471918
 blob_append(&g.httpHeader, zLine, -1);
@@ -1916,10 +1987,11 @@
19161987
 char *z, *zToken;
19171988
 const char *zType = 0;
19181989
 int i, content_length = 0;
19191990
 char zLine[2000]; /* A single line of input. */
19201991
1992
+ assert( !g.httpUseSSL );
19211993
 #ifdef FOSSIL_ENABLE_JSON
19221994
 if( nCycles==0 ){ json_bootstrap_early(); }
19231995
 #endif
19241996
 if( zIpAddr ){
19251997
 if( nCycles==0 ){
@@ -2057,10 +2129,11 @@
20572129
 /*
20582130
 ** This routine handles the old fossil SSH probes
20592131
 */
20602132
 char *cgi_handle_ssh_probes(char *zLine, int zSize, char *z, char *zToken){
20612133
 /* Start looking for probes */
2134
+ assert( !g.httpUseSSL );
20622135
 while( fossil_strcmp(zToken, "echo")==0 ){
20632136
 zToken = extract_token(z, &z);
20642137
 if( zToken==0 ){
20652138
 malformed_request("malformed probe");
20662139
 }
@@ -2094,10 +2167,11 @@
20942167
 */
20952168
 void cgi_handle_ssh_transport(const char *zCmd){
20962169
 char *z, *zToken;
20972170
 char zLine[2000]; /* A single line of input. */
20982171
2172
+ assert( !g.httpUseSSL );
20992173
 /* look for second newline of transport_flip */
21002174
 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
21012175
 malformed_request("incorrect transport_flip");
21022176
 }
21032177
 cgi_trace(zLine);
@@ -2143,10 +2217,11 @@
21432217
 char *zToFree;
21442218
 int nHdr = 0;
21452219
 int nRead;
21462220
 int c, n, m;
21472221
2222
+ assert( !g.httpUseSSL );
21482223
 while( (c = fgetc(g.httpIn))!=EOF && fossil_isdigit((char)c) ){
21492224
 nHdr = nHdr*10 + (char)c - '0';
21502225
 }
21512226
 if( nHdr<16 ) malformed_request("SCGI header too short");
21522227
 zToFree = zHdr = fossil_malloc(nHdr);
21532228
--- src/cgi.c
+++ src/cgi.c
@@ -84,10 +84,11 @@
84 #endif
85 #include <time.h>
86 #include <stdio.h>
87 #include <stdlib.h>
88 #include <unistd.h>
 
89 #include "cgi.h"
90 #include "cygsup.h"
91
92 #if INTERFACE
93 /*
@@ -333,10 +334,79 @@
333 if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
334 return strncmp(zContentType, "text/", 5)==0
335 || sqlite3_strglob("application/*xml", zContentType)==0
336 || sqlite3_strglob("application/*javascript", zContentType)==0;
337 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
338
339 /*
340 ** Generate the reply to a web request. The output might be an
341 ** full HTTP response, or a CGI response, depending on how things have
342 ** be set up.
@@ -436,11 +506,11 @@
436 blob_appendf(&hdr, "Content-Length: %d\r\n", total_size);
437 }else{
438 total_size = 0;
439 }
440 blob_appendf(&hdr, "\r\n");
441 fwrite(blob_buffer(&hdr), 1, blob_size(&hdr), g.httpOut);
442 blob_reset(&hdr);
443 if( total_size>0
444 && iReplyStatus!=304
445 && fossil_strcmp(P("REQUEST_METHOD"),"HEAD")!=0
446 ){
@@ -452,17 +522,17 @@
452 }else{
453 int n = size - rangeStart;
454 if( n>total_size ){
455 n = total_size;
456 }
457 fwrite(blob_buffer(&cgiContent[i])+rangeStart, 1, n, g.httpOut);
458 rangeStart = 0;
459 total_size -= n;
460 }
461 }
462 }
463 fflush(g.httpOut);
464 CGIDEBUG(("-------- END cgi ---------\n"));
465
466 /* After the webpage has been sent, do any useful background
467 ** processing.
468 */
@@ -1262,18 +1332,19 @@
1262 g.zContentType = zType;
1263 }
1264 blob_zero(&g.cgiIn);
1265 if( len>0 && zType ){
1266 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1267 if( blob_read_from_channel(&g.cgiIn, g.httpIn, len)!=len ){
1268 malformed_request("CGI content-length mismatch");
1269 }
1270 blob_uncompress(&g.cgiIn, &g.cgiIn);
1271 }
1272 #ifdef FOSSIL_ENABLE_JSON
1273 else if( noJson==0 && g.json.isJsonMode!=0
1274 && json_can_consume_content_type(zType)!=0 ){
 
1275 cgi_parse_POST_JSON(g.httpIn, (unsigned int)len);
1276 /*
1277 Potential TODOs:
1278
1279 1) If parsing fails, immediately return an error response
@@ -1281,11 +1352,11 @@
1281 */
1282 cgi_set_content_type(json_guess_content_type());
1283 }
1284 #endif /* FOSSIL_ENABLE_JSON */
1285 else{
1286 blob_read_from_channel(&g.cgiIn, g.httpIn, len);
1287 }
1288 }
1289 }
1290
1291 /*
@@ -1799,11 +1870,11 @@
1799 char *z, *zToken;
1800 int i;
1801 const char *zScheme = "http";
1802 char zLine[2000]; /* A single line of input. */
1803 g.fullHttpReply = 1;
1804 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
1805 malformed_request("missing HTTP header");
1806 }
1807 blob_append(&g.httpHeader, zLine, -1);
1808 cgi_trace(zLine);
1809 zToken = extract_token(zLine, &z);
@@ -1837,11 +1908,11 @@
1837 }
1838
1839
1840 /* Get all the optional fields that follow the first line.
1841 */
1842 while( fgets(zLine,sizeof(zLine),g.httpIn) ){
1843 char *zFieldName;
1844 char *zVal;
1845
1846 cgi_trace(zLine);
1847 blob_append(&g.httpHeader, zLine, -1);
@@ -1916,10 +1987,11 @@
1916 char *z, *zToken;
1917 const char *zType = 0;
1918 int i, content_length = 0;
1919 char zLine[2000]; /* A single line of input. */
1920
 
1921 #ifdef FOSSIL_ENABLE_JSON
1922 if( nCycles==0 ){ json_bootstrap_early(); }
1923 #endif
1924 if( zIpAddr ){
1925 if( nCycles==0 ){
@@ -2057,10 +2129,11 @@
2057 /*
2058 ** This routine handles the old fossil SSH probes
2059 */
2060 char *cgi_handle_ssh_probes(char *zLine, int zSize, char *z, char *zToken){
2061 /* Start looking for probes */
 
2062 while( fossil_strcmp(zToken, "echo")==0 ){
2063 zToken = extract_token(z, &z);
2064 if( zToken==0 ){
2065 malformed_request("malformed probe");
2066 }
@@ -2094,10 +2167,11 @@
2094 */
2095 void cgi_handle_ssh_transport(const char *zCmd){
2096 char *z, *zToken;
2097 char zLine[2000]; /* A single line of input. */
2098
 
2099 /* look for second newline of transport_flip */
2100 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
2101 malformed_request("incorrect transport_flip");
2102 }
2103 cgi_trace(zLine);
@@ -2143,10 +2217,11 @@
2143 char *zToFree;
2144 int nHdr = 0;
2145 int nRead;
2146 int c, n, m;
2147
 
2148 while( (c = fgetc(g.httpIn))!=EOF && fossil_isdigit((char)c) ){
2149 nHdr = nHdr*10 + (char)c - '0';
2150 }
2151 if( nHdr<16 ) malformed_request("SCGI header too short");
2152 zToFree = zHdr = fossil_malloc(nHdr);
2153
--- src/cgi.c
+++ src/cgi.c
@@ -84,10 +84,11 @@
84 #endif
85 #include <time.h>
86 #include <stdio.h>
87 #include <stdlib.h>
88 #include <unistd.h>
89 #include <assert.h>
90 #include "cgi.h"
91 #include "cygsup.h"
92
93 #if INTERFACE
94 /*
@@ -333,10 +334,79 @@
334 if( strstr(PD("HTTP_ACCEPT_ENCODING", ""), "gzip")==0 ) return 0;
335 return strncmp(zContentType, "text/", 5)==0
336 || sqlite3_strglob("application/*xml", zContentType)==0
337 || sqlite3_strglob("application/*javascript", zContentType)==0;
338 }
339
340
341 /*
342 ** The following routines read or write content from/to the wire for
343 ** an HTTP request. Depending on settings the content might be coming
344 ** from or going to a socket, or a file, or it might come from or go
345 ** to an SSL decoder/encoder.
346 */
347 /*
348 ** Works like fgets():
349 **
350 ** Read a single line of input into s[]. Ensure that s[] is zero-terminated.
351 ** The s[] buffer is size bytes and so at most size-1 bytes will be read.
352 **
353 ** Return a pointer to s[] on success, or NULL at end-of-input.
354 */
355 static char *cgi_fgets(char *s, int size){
356 if( !g.httpUseSSL ){
357 return fgets(s, size, g.httpIn);
358 }
359 assert( !"SSL Server not yet implemented" );
360 }
361
362 /* Works like fread():
363 **
364 ** Read as many as bytes of content as we can, up to a maximum of nmemb
365 ** bytes. Return the number of bytes read. Return -1 if there is no
366 ** further input or if an I/O error occurs.
367 */
368 size_t cgi_fread(void *ptr, size_t nmemb){
369 if( !g.httpUseSSL ){
370 return fread(ptr, 1, nmemb, g.httpIn);
371 }
372 assert( !"SSL Server not yet implemented" );
373 }
374
375 /* Works like feof():
376 **
377 ** Return true if end-of-input has been reached.
378 */
379 int cgi_feof(void){
380 if( !g.httpUseSSL ){
381 return feof(g.httpIn);
382 }
383 assert( !"SSL Server not yet implemented" );
384 }
385
386 /* Works like fwrite():
387 **
388 ** Try to output nmemb bytes of content. Return the number of
389 ** bytes actually written.
390 */
391 static size_t cgi_fwrite(void *ptr, size_t nmemb){
392 if( !g.httpUseSSL ){
393 return fwrite(ptr, 1, nmemb, g.httpOut);
394 }
395 assert( !"SSL Server not yet implemented" );
396 }
397
398 /* Works like fflush():
399 **
400 ** Make sure I/O has completed.
401 */
402 static void cgi_fflush(void){
403 if( !g.httpUseSSL ){
404 fflush(g.httpOut);
405 }
406 }
407
408
409 /*
410 ** Generate the reply to a web request. The output might be an
411 ** full HTTP response, or a CGI response, depending on how things have
412 ** be set up.
@@ -436,11 +506,11 @@
506 blob_appendf(&hdr, "Content-Length: %d\r\n", total_size);
507 }else{
508 total_size = 0;
509 }
510 blob_appendf(&hdr, "\r\n");
511 cgi_fwrite(blob_buffer(&hdr), blob_size(&hdr));
512 blob_reset(&hdr);
513 if( total_size>0
514 && iReplyStatus!=304
515 && fossil_strcmp(P("REQUEST_METHOD"),"HEAD")!=0
516 ){
@@ -452,17 +522,17 @@
522 }else{
523 int n = size - rangeStart;
524 if( n>total_size ){
525 n = total_size;
526 }
527 cgi_fwrite(blob_buffer(&cgiContent[i])+rangeStart, n);
528 rangeStart = 0;
529 total_size -= n;
530 }
531 }
532 }
533 cgi_fflush();
534 CGIDEBUG(("-------- END cgi ---------\n"));
535
536 /* After the webpage has been sent, do any useful background
537 ** processing.
538 */
@@ -1262,18 +1332,19 @@
1332 g.zContentType = zType;
1333 }
1334 blob_zero(&g.cgiIn);
1335 if( len>0 && zType ){
1336 if( fossil_strcmp(zType, "application/x-fossil")==0 ){
1337 if( blob_read_from_cgi(&g.cgiIn, len)!=len ){
1338 malformed_request("CGI content-length mismatch");
1339 }
1340 blob_uncompress(&g.cgiIn, &g.cgiIn);
1341 }
1342 #ifdef FOSSIL_ENABLE_JSON
1343 else if( noJson==0 && g.json.isJsonMode!=0
1344 && json_can_consume_content_type(zType)!=0 ){
1345 assert( !g.httpUseSSL );
1346 cgi_parse_POST_JSON(g.httpIn, (unsigned int)len);
1347 /*
1348 Potential TODOs:
1349
1350 1) If parsing fails, immediately return an error response
@@ -1281,11 +1352,11 @@
1352 */
1353 cgi_set_content_type(json_guess_content_type());
1354 }
1355 #endif /* FOSSIL_ENABLE_JSON */
1356 else{
1357 blob_read_from_cgi(&g.cgiIn, len);
1358 }
1359 }
1360 }
1361
1362 /*
@@ -1799,11 +1870,11 @@
1870 char *z, *zToken;
1871 int i;
1872 const char *zScheme = "http";
1873 char zLine[2000]; /* A single line of input. */
1874 g.fullHttpReply = 1;
1875 if( cgi_fgets(zLine, sizeof(zLine))==0 ){
1876 malformed_request("missing HTTP header");
1877 }
1878 blob_append(&g.httpHeader, zLine, -1);
1879 cgi_trace(zLine);
1880 zToken = extract_token(zLine, &z);
@@ -1837,11 +1908,11 @@
1908 }
1909
1910
1911 /* Get all the optional fields that follow the first line.
1912 */
1913 while( cgi_fgets(zLine,sizeof(zLine)) ){
1914 char *zFieldName;
1915 char *zVal;
1916
1917 cgi_trace(zLine);
1918 blob_append(&g.httpHeader, zLine, -1);
@@ -1916,10 +1987,11 @@
1987 char *z, *zToken;
1988 const char *zType = 0;
1989 int i, content_length = 0;
1990 char zLine[2000]; /* A single line of input. */
1991
1992 assert( !g.httpUseSSL );
1993 #ifdef FOSSIL_ENABLE_JSON
1994 if( nCycles==0 ){ json_bootstrap_early(); }
1995 #endif
1996 if( zIpAddr ){
1997 if( nCycles==0 ){
@@ -2057,10 +2129,11 @@
2129 /*
2130 ** This routine handles the old fossil SSH probes
2131 */
2132 char *cgi_handle_ssh_probes(char *zLine, int zSize, char *z, char *zToken){
2133 /* Start looking for probes */
2134 assert( !g.httpUseSSL );
2135 while( fossil_strcmp(zToken, "echo")==0 ){
2136 zToken = extract_token(z, &z);
2137 if( zToken==0 ){
2138 malformed_request("malformed probe");
2139 }
@@ -2094,10 +2167,11 @@
2167 */
2168 void cgi_handle_ssh_transport(const char *zCmd){
2169 char *z, *zToken;
2170 char zLine[2000]; /* A single line of input. */
2171
2172 assert( !g.httpUseSSL );
2173 /* look for second newline of transport_flip */
2174 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
2175 malformed_request("incorrect transport_flip");
2176 }
2177 cgi_trace(zLine);
@@ -2143,10 +2217,11 @@
2217 char *zToFree;
2218 int nHdr = 0;
2219 int nRead;
2220 int c, n, m;
2221
2222 assert( !g.httpUseSSL );
2223 while( (c = fgetc(g.httpIn))!=EOF && fossil_isdigit((char)c) ){
2224 nHdr = nHdr*10 + (char)c - '0';
2225 }
2226 if( nHdr<16 ) malformed_request("SCGI header too short");
2227 zToFree = zHdr = fossil_malloc(nHdr);
2228
M src/main.c
+1
--- src/main.c
+++ src/main.c
@@ -195,10 +195,11 @@
195195
 Th_Interp *interp; /* The TH1 interpreter */
196196
 char *th1Setup; /* The TH1 post-creation setup script, if any */
197197
 int th1Flags; /* The TH1 integration state flags */
198198
 FILE *httpIn; /* Accept HTTP input from here */
199199
 FILE *httpOut; /* Send HTTP output here */
200
+ int httpUseSSL; /* True to use an SSL codec for HTTP traffic */
200201
 int xlinkClusterOnly; /* Set when cloning. Only process clusters */
201202
 int fTimeFormat; /* 1 for UTC. 2 for localtime. 0 not yet selected */
202203
 int *aCommitFile; /* Array of files to be committed */
203204
 int markPrivate; /* All new artifacts are private if true */
204205
 char *ckinLockFail; /* Check-in lock failure received from server */
205206
--- src/main.c
+++ src/main.c
@@ -195,10 +195,11 @@
195 Th_Interp *interp; /* The TH1 interpreter */
196 char *th1Setup; /* The TH1 post-creation setup script, if any */
197 int th1Flags; /* The TH1 integration state flags */
198 FILE *httpIn; /* Accept HTTP input from here */
199 FILE *httpOut; /* Send HTTP output here */
 
200 int xlinkClusterOnly; /* Set when cloning. Only process clusters */
201 int fTimeFormat; /* 1 for UTC. 2 for localtime. 0 not yet selected */
202 int *aCommitFile; /* Array of files to be committed */
203 int markPrivate; /* All new artifacts are private if true */
204 char *ckinLockFail; /* Check-in lock failure received from server */
205
--- src/main.c
+++ src/main.c
@@ -195,10 +195,11 @@
195 Th_Interp *interp; /* The TH1 interpreter */
196 char *th1Setup; /* The TH1 post-creation setup script, if any */
197 int th1Flags; /* The TH1 integration state flags */
198 FILE *httpIn; /* Accept HTTP input from here */
199 FILE *httpOut; /* Send HTTP output here */
200 int httpUseSSL; /* True to use an SSL codec for HTTP traffic */
201 int xlinkClusterOnly; /* Set when cloning. Only process clusters */
202 int fTimeFormat; /* 1 for UTC. 2 for localtime. 0 not yet selected */
203 int *aCommitFile; /* Array of files to be committed */
204 int markPrivate; /* All new artifacts are private if true */
205 char *ckinLockFail; /* Check-in lock failure received from server */
206

Keyboard Shortcuts

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