Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch ssh-path-prefix Excluding Merge-Ins
This is equivalent to a diff from 53a06590 to bcf6abe5
2024-02-06
| ||
11:22 | Only add the PATH= prefix on the fossil command sent over SSH for ssh: syncs if a prior attempt to contact the remote failed to find the Fossil executable. (check-in: cbf27ece user: drh tags: trunk) | |
03:22 | Don't use the ssh file descriptor as an indicator that we should be using SSH transport. Arguably we could also just reset sshIn to 0, but I think this is better. (Closed-Leaf check-in: bcf6abe5 user: andybradford tags: ssh-path-prefix) | |
2024-02-05
| ||
23:59 | Debugging changes in url.c: Ensure that each new UrlData object parse is fully reinitialized. Bring out printing of g.url into a separate routine so that it can be called during debugging. (check-in: 97b3f955 user: drh tags: ssh-path-prefix) | |
22:00 | Omit the PATH= prefix on the ssh fossil syncs unless the first attempt to contact the remote fails. Change the prefix to include common directories for Fossil on Macs. Remember whether or not the PATH= prefix is needed based on hostname. See the discussion at forum thread 4903cb4b691af7ce. (check-in: d07689d1 user: drh tags: ssh-path-prefix) | |
03:15 | Update www/loadmgmt.md to match the current behavior, per feedback in the forum. (check-in: 53a06590 user: stephan tags: trunk) | |
2024-02-04
| ||
22:12 | Add missing "#include <errno.h>" that was needed on previous commit. (check-in: a66a14b0 user: mgagnon tags: trunk) | |
Changes to src/http.c.
︙ | ︙ | |||
302 303 304 305 306 307 308 309 310 311 312 313 314 315 | int isError = 0; /* True if the reply is an error message */ int isCompressed = 1; /* True if the reply is compressed */ if( g.zHttpCmd!=0 ){ /* Handle the --transport-command option for "fossil sync" and similar */ return http_exchange_external(pSend,pReply,mHttpFlags,zAltMimetype); } if( transport_open(&g.url) ){ fossil_warning("%s", transport_errmsg(&g.url)); return 1; } /* Construct the login card and prepare the complete payload */ | > > > > > > > > > > > | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 | int isError = 0; /* True if the reply is an error message */ int isCompressed = 1; /* True if the reply is compressed */ if( g.zHttpCmd!=0 ){ /* Handle the --transport-command option for "fossil sync" and similar */ return http_exchange_external(pSend,pReply,mHttpFlags,zAltMimetype); } /* Activate the PATH= auxiliary argument to the ssh command if that ** is called for. */ if( g.url.isSsh && (g.url.flags & URL_SSH_RETRY)==0 ){ char *z = mprintf("use-path-for-ssh:%s", g.url.hostname); if( db_get_boolean(z/*works-like:"x"*/, 0) ){ g.url.flags |= URL_SSH_PATH; } fossil_free(z); } if( transport_open(&g.url) ){ fossil_warning("%s", transport_errmsg(&g.url)); return 1; } /* Construct the login card and prepare the complete payload */ |
︙ | ︙ | |||
482 483 484 485 486 487 488 | }else if( fossil_strnicmp(&zLine[14], "application/x-fossil", -1)!=0 ){ isError = 1; } } } } if( iLength<0 ){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > | 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 | }else if( fossil_strnicmp(&zLine[14], "application/x-fossil", -1)!=0 ){ isError = 1; } } } } if( iLength<0 ){ /* We got nothing back from the server. If using the ssh: protocol, ** this might mean we need to add or remove the PATH=... argument ** to the SSH command being sent. If that is the case, retry the ** request after adding or removing the PATH= argument. */ if( g.url.isSsh /* This is an SSH: sync */ && (g.url.flags & URL_SSH_EXE)==0 /* Does not have ?fossil=.... */ && (g.url.flags & URL_SSH_RETRY)==0 /* Not retried already */ ){ /* Retry after flipping the SSH_PATH setting */ transport_close(&g.url); if( g.fSshTrace ){ printf("Retry after %s the PATH= argument to the SSH command\n", (g.url.flags & URL_SSH_PATH)!=0 ? "removing" : "adding"); } g.url.flags ^= URL_SSH_PATH|URL_SSH_RETRY; rc = http_exchange(pSend,pReply,mHttpFlags,0,zAltMimetype); if( rc==0 && (g.url.flags & URL_REMEMBER)!=0 ){ char *z = mprintf("use-path-for-ssh:%s", g.url.hostname); if( (g.url.flags & URL_SSH_PATH) ){ db_set(z/*works-like:"x"*/, "1", 1); }else{ db_unset(z/*works-like:"x"*/, 1); } fossil_free(z); } return rc; }else{ /* The problem could not be corrected by retrying. Report the ** the error. */ fossil_warning("server did not reply"); goto write_err; } } if( rc!=200 ){ fossil_warning("\"location:\" missing from %d redirect reply", rc); goto write_err; } /* |
︙ | ︙ |
Changes to src/http_transport.c.
︙ | ︙ | |||
129 130 131 132 133 134 135 | if( pUrlData->user && pUrlData->user[0] ){ zHost = mprintf("%s@%s", pUrlData->user, pUrlData->name); blob_append_escaped_arg(&zCmd, zHost, 0); fossil_free(zHost); }else{ blob_append_escaped_arg(&zCmd, pUrlData->name, 0); } | > | > > > > | > > | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | if( pUrlData->user && pUrlData->user[0] ){ zHost = mprintf("%s@%s", pUrlData->user, pUrlData->name); blob_append_escaped_arg(&zCmd, zHost, 0); fossil_free(zHost); }else{ blob_append_escaped_arg(&zCmd, pUrlData->name, 0); } if( (pUrlData->flags & URL_SSH_EXE)!=0 && !is_safe_fossil_command(pUrlData->fossil) ){ fossil_fatal("the ssh:// URL is asking to run an unsafe command [%s] on " "the server.", pUrlData->fossil); } if( (pUrlData->flags & URL_SSH_EXE)==0 && (pUrlData->flags & URL_SSH_PATH)!=0 ){ blob_append_escaped_arg(&zCmd, "PATH=bin:/usr/local/bin:/opt/homebrew/bin:$PATH", 1); } blob_append_escaped_arg(&zCmd, pUrlData->fossil, 1); blob_append(&zCmd, " test-http", 10); if( pUrlData->path && pUrlData->path[0] ){ blob_append_escaped_arg(&zCmd, pUrlData->path, 1); }else{ fossil_fatal("ssh:// URI does not specify a path to the repository"); } |
︙ | ︙ | |||
311 312 313 314 315 316 317 | /* ** Read N bytes of content directly from the wire and write into ** the buffer. */ static int transport_fetch(UrlData *pUrlData, char *zBuf, int N){ int got; | | | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 | /* ** Read N bytes of content directly from the wire and write into ** the buffer. */ static int transport_fetch(UrlData *pUrlData, char *zBuf, int N){ int got; if( pUrlData->isSsh ){ int x; int wanted = N; got = 0; while( wanted>0 ){ x = read(sshIn, &zBuf[got], wanted); if( x<=0 ) break; got += x; |
︙ | ︙ |
Changes to src/popen.c.
︙ | ︙ | |||
192 193 194 195 196 197 198 199 200 201 202 203 204 205 | close(pout[0]); close(pout[1]); close(1); fd = dup(pin[1]); if( fd!=1 ) fossil_panic("popen() failed to open file descriptor 1"); close(pin[0]); close(pin[1]); if( bDirect ){ execl(zCmd, zCmd, (char*)0); }else{ execl("/bin/sh", "/bin/sh", "-c", zCmd, (char*)0); } return 1; }else{ | > | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | close(pout[0]); close(pout[1]); close(1); fd = dup(pin[1]); if( fd!=1 ) fossil_panic("popen() failed to open file descriptor 1"); close(pin[0]); close(pin[1]); close(2); dup(1); /* Redirect stderr into the stdout pipe */ if( bDirect ){ execl(zCmd, zCmd, (char*)0); }else{ execl("/bin/sh", "/bin/sh", "-c", zCmd, (char*)0); } return 1; }else{ |
︙ | ︙ |
Changes to src/url.c.
︙ | ︙ | |||
31 32 33 34 35 36 37 | #endif #endif #if INTERFACE /* ** Flags for url_parse() */ | | | | | | | | | > > > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | #endif #endif #if INTERFACE /* ** Flags for url_parse() */ #define URL_PROMPT_PW 0x0001 /* Prompt for password if needed */ #define URL_REMEMBER 0x0002 /* Remember the url for later reuse */ #define URL_ASK_REMEMBER_PW 0x0004 /* Ask whether to remember prompted pw */ #define URL_REMEMBER_PW 0x0008 /* Should remember pw */ #define URL_PROMPTED 0x0010 /* Prompted for PW already */ #define URL_OMIT_USER 0x0020 /* Omit the user name from URL */ #define URL_USE_CONFIG 0x0040 /* Use remembered URLs from CONFIG table */ #define URL_USE_PARENT 0x0080 /* Use the URL of the parent project */ #define URL_SSH_PATH 0x0100 /* Include PATH= on SSH syncs */ #define URL_SSH_RETRY 0x0200 /* This a retry of an SSH */ #define URL_SSH_EXE 0x0400 /* ssh: URL contains fossil= query param*/ /* ** The URL related data used with this subsystem. */ struct UrlData { int isFile; /* True if a "file:" url */ int isHttps; /* True if a "https:" url */ |
︙ | ︙ | |||
108 109 110 111 112 113 114 | const char *zUrl, unsigned int urlFlags, UrlData *pUrlData ){ int i, j, c; char *zFile = 0; | | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | const char *zUrl, unsigned int urlFlags, UrlData *pUrlData ){ int i, j, c; char *zFile = 0; memset(pUrlData, 0, sizeof(*pUrlData)); if( urlFlags & URL_USE_CONFIG ){ if( zUrl==0 || strcmp(zUrl,"default")==0 ){ const char *zPwConfig = "last-sync-pw"; if( urlFlags & URL_USE_PARENT ){ zUrl = db_get("parent-project-url", 0); if( zUrl==0 ){ zUrl = db_get("last-sync-url",0); |
︙ | ︙ | |||
157 158 159 160 161 162 163 | || strncmp(zUrl, "ssh://", 6)==0 ){ int iStart; char *zLogin; char *zExe; char cQuerySep = '?'; | < < | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | || strncmp(zUrl, "ssh://", 6)==0 ){ int iStart; char *zLogin; char *zExe; char cQuerySep = '?'; if( zUrl[4]=='s' ){ pUrlData->isHttps = 1; pUrlData->protocol = "https"; pUrlData->dfltPort = 443; iStart = 8; }else if( zUrl[0]=='s' ){ pUrlData->isSsh = 1; |
︙ | ︙ | |||
253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | while( pUrlData->path[i] && pUrlData->path[i]!='&' ){ i++; } } if( pUrlData->path[i] ){ pUrlData->path[i] = 0; i++; } if( fossil_strcmp(zName,"fossil")==0 ){ pUrlData->fossil = fossil_strdup(zValue); dehttpize(pUrlData->fossil); fossil_free(zExe); zExe = mprintf("%cfossil=%T", cQuerySep, pUrlData->fossil); cQuerySep = '&'; } } dehttpize(pUrlData->path); if( pUrlData->dfltPort==pUrlData->port ){ pUrlData->canonical = mprintf( "%s://%s%T%T%z", | > > | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | while( pUrlData->path[i] && pUrlData->path[i]!='&' ){ i++; } } if( pUrlData->path[i] ){ pUrlData->path[i] = 0; i++; } if( fossil_strcmp(zName,"fossil")==0 ){ fossil_free(pUrlData->fossil); pUrlData->fossil = fossil_strdup(zValue); dehttpize(pUrlData->fossil); fossil_free(zExe); zExe = mprintf("%cfossil=%T", cQuerySep, pUrlData->fossil); cQuerySep = '&'; urlFlags |= URL_SSH_EXE; } } dehttpize(pUrlData->path); if( pUrlData->dfltPort==pUrlData->port ){ pUrlData->canonical = mprintf( "%s://%s%T%T%z", |
︙ | ︙ | |||
451 452 453 454 455 456 457 458 459 460 461 462 463 464 | ** password is taken from the CONFIG table, the g.url.pwConfig field is ** set to the CONFIG.NAME value from which that password is taken. Otherwise, ** g.url.pwConfig is NULL. */ void url_parse(const char *zUrl, unsigned int urlFlags){ url_parse_local(zUrl, urlFlags, &g.url); } /* ** COMMAND: test-urlparser ** ** Usage: %fossil test-urlparser URL ?options? ** ** --prompt-pw Prompt for password if missing | > > > > > > > > > > > > > > > > > > > > > > > > > > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | ** password is taken from the CONFIG table, the g.url.pwConfig field is ** set to the CONFIG.NAME value from which that password is taken. Otherwise, ** g.url.pwConfig is NULL. */ void url_parse(const char *zUrl, unsigned int urlFlags){ url_parse_local(zUrl, urlFlags, &g.url); } /* ** Print the content of g.url */ void urlparse_print(int showPw){ fossil_print("g.url.isFile = %d\n", g.url.isFile); fossil_print("g.url.isHttps = %d\n", g.url.isHttps); fossil_print("g.url.isSsh = %d\n", g.url.isSsh); fossil_print("g.url.protocol = %s\n", g.url.protocol); fossil_print("g.url.name = %s\n", g.url.name); fossil_print("g.url.port = %d\n", g.url.port); fossil_print("g.url.dfltPort = %d\n", g.url.dfltPort); fossil_print("g.url.hostname = %s\n", g.url.hostname); fossil_print("g.url.path = %s\n", g.url.path); fossil_print("g.url.user = %s\n", g.url.user); if( showPw || g.url.pwConfig==0 ){ fossil_print("g.url.passwd = %s\n", g.url.passwd); }else{ fossil_print("g.url.passwd = ************\n"); } fossil_print("g.url.pwConfig = %s\n", g.url.pwConfig); fossil_print("g.url.canonical = %s\n", g.url.canonical); fossil_print("g.url.fossil = %s\n", g.url.fossil); fossil_print("g.url.flags = 0x%04x\n", g.url.flags); fossil_print("url_full(g.url) = %z\n", url_full(&g.url)); } /* ** COMMAND: test-urlparser ** ** Usage: %fossil test-urlparser URL ?options? ** ** --prompt-pw Prompt for password if missing |
︙ | ︙ | |||
480 481 482 483 484 485 486 | if( find_option("show-pw",0,0) ) showPw = 1; if( (fg & URL_USE_CONFIG)==0 ) showPw = 1; if( g.argc!=3 && g.argc!=4 ){ usage("URL"); } url_parse(g.argv[2], fg); for(i=0; i<2; i++){ | < < < < < < < < < < | < < < < < < < < < | 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 | if( find_option("show-pw",0,0) ) showPw = 1; if( (fg & URL_USE_CONFIG)==0 ) showPw = 1; if( g.argc!=3 && g.argc!=4 ){ usage("URL"); } url_parse(g.argv[2], fg); for(i=0; i<2; i++){ urlparse_print(showPw); if( g.url.isFile || g.url.isSsh ) break; if( i==0 ){ fossil_print("********\n"); url_enable_proxy("Using proxy: "); } url_unparse(0); } |
︙ | ︙ |