Fossil SCM

Phase 3, the TH1 http command now uses non-global URL data. This also required heavy refactoring of some other callers that use the global URL data.

mistachkin 2013-10-14 07:08 UTC tkt-change-hook

Commit 8ce9c1af8f60a6471537b08275406c74f13ce846

Parent 047b0174b7d3db8…

8 files changed +11 -11 +9 -8 +17 -15 +46 -46 +6 +16 -16 +247 -179 +2 -2

~ src/http.c ~ src/http_socket.c ~ src/http_ssl.c ~ src/http_transport.c ~ src/main.c ~ src/th_main.c ~ src/url.c ~ src/xfer.c

M src/http.c

+11 -11

		--- src/http.c
		+++ src/http.c
		@@ -144,12 +144,12 @@
144	144	char zLine; / A single line of the reply header */
145	145	int i; /* Loop counter */
146	146	int isError = 0; /* True if the reply is an error message */
147	147	int isCompressed = 1; /* True if the reply is compressed */
148	148
149		- if( transport_open() ){
150		- fossil_warning(transport_errmsg());
	149	+ if( transport_open(GLOBAL_URL()) ){
	150	+ fossil_warning(transport_errmsg(GLOBAL_URL()));
151	151	return 1;
152	152	}
153	153
154	154	/* Construct the login card and prepare the complete payload */
155	155	blob_zero(&login);
		@@ -191,22 +191,22 @@
191	191	}
192	192
193	193	/*
194	194	** Send the request to the server.
195	195	*/
196		- transport_send(&hdr);
197		- transport_send(&payload);
	196	+ transport_send(GLOBAL_URL(), &hdr);
	197	+ transport_send(GLOBAL_URL(), &payload);
198	198	blob_reset(&hdr);
199	199	blob_reset(&payload);
200		- transport_flip();
	200	+ transport_flip(GLOBAL_URL());
201	201
202	202	/*
203	203	** Read and interpret the server reply
204	204	*/
205	205	closeConnection = 1;
206	206	iLength = -1;
207		- while( (zLine = transport_receive_line())!=0 && zLine[0]!=0 ){
	207	+ while( (zLine = transport_receive_line(GLOBAL_URL()))!=0 && zLine[0]!=0 ){
208	208	/* printf("[%s]\n", zLine); fflush(stdout); */
209	209	if( fossil_strnicmp(zLine, "http/1.", 7)==0 ){
210	210	if( sscanf(zLine, "HTTP/1.%d %d", &iHttpVersion, &rc)!=2 ) goto write_err;
211	211	if( rc!=200 && rc!=302 ){
212	212	int ii;
		@@ -255,11 +255,11 @@
255	255	j -= 4;
256	256	zLine[j] = 0;
257	257	}
258	258	fossil_print("redirect to %s\n", &zLine[i]);
259	259	url_parse(&zLine[i], 0);
260		- transport_close();
	260	+ transport_close(GLOBAL_URL());
261	261	return http_exchange(pSend, pReply, useLogin, maxRedirect);
262	262	}else if( fossil_strnicmp(zLine, "content-type: ", 14)==0 ){
263	263	if( fossil_strnicmp(&zLine[14], "application/x-fossil-debug", -1)==0 ){
264	264	isCompressed = 0;
265	265	}else if( fossil_strnicmp(&zLine[14],
		@@ -282,11 +282,11 @@
282	282	/*
283	283	** Extract the reply payload that follows the header
284	284	*/
285	285	blob_zero(pReply);
286	286	blob_resize(pReply, iLength);
287		- iLength = transport_receive(blob_buffer(pReply), iLength);
	287	+ iLength = transport_receive(GLOBAL_URL(), blob_buffer(pReply), iLength);
288	288	blob_resize(pReply, iLength);
289	289	if( isError ){
290	290	char *z;
291	291	int i, j;
292	292	z = blob_str(pReply);
		@@ -311,18 +311,18 @@
311	311	**
312	312	** For SSH we will leave the connection open.
313	313	*/
314	314	if( ! g.urlIsSsh ) closeConnection = 1; /* FIX ME */
315	315	if( closeConnection ){
316		- transport_close();
	316	+ transport_close(GLOBAL_URL());
317	317	}else{
318		- transport_rewind();
	318	+ transport_rewind(GLOBAL_URL());
319	319	}
320	320	return 0;
321	321
322	322	/*
323	323	** Jump to here if an error is seen.
324	324	*/
325	325	write_err:
326		- transport_close();
	326	+ transport_close(GLOBAL_URL());
327	327	return 1;
328	328	}
329	329

	--- src/http.c
	+++ src/http.c
	@@ -144,12 +144,12 @@
144	char zLine; / A single line of the reply header */
145	int i; /* Loop counter */
146	int isError = 0; /* True if the reply is an error message */
147	int isCompressed = 1; /* True if the reply is compressed */
148
149	if( transport_open() ){
150	fossil_warning(transport_errmsg());
151	return 1;
152	}
153
154	/* Construct the login card and prepare the complete payload */
155	blob_zero(&login);
	@@ -191,22 +191,22 @@
191	}
192
193	/*
194	** Send the request to the server.
195	*/
196	transport_send(&hdr);
197	transport_send(&payload);
198	blob_reset(&hdr);
199	blob_reset(&payload);
200	transport_flip();
201
202	/*
203	** Read and interpret the server reply
204	*/
205	closeConnection = 1;
206	iLength = -1;
207	while( (zLine = transport_receive_line())!=0 && zLine[0]!=0 ){
208	/* printf("[%s]\n", zLine); fflush(stdout); */
209	if( fossil_strnicmp(zLine, "http/1.", 7)==0 ){
210	if( sscanf(zLine, "HTTP/1.%d %d", &iHttpVersion, &rc)!=2 ) goto write_err;
211	if( rc!=200 && rc!=302 ){
212	int ii;
	@@ -255,11 +255,11 @@
255	j -= 4;
256	zLine[j] = 0;
257	}
258	fossil_print("redirect to %s\n", &zLine[i]);
259	url_parse(&zLine[i], 0);
260	transport_close();
261	return http_exchange(pSend, pReply, useLogin, maxRedirect);
262	}else if( fossil_strnicmp(zLine, "content-type: ", 14)==0 ){
263	if( fossil_strnicmp(&zLine[14], "application/x-fossil-debug", -1)==0 ){
264	isCompressed = 0;
265	}else if( fossil_strnicmp(&zLine[14],
	@@ -282,11 +282,11 @@
282	/*
283	** Extract the reply payload that follows the header
284	*/
285	blob_zero(pReply);
286	blob_resize(pReply, iLength);
287	iLength = transport_receive(blob_buffer(pReply), iLength);
288	blob_resize(pReply, iLength);
289	if( isError ){
290	char *z;
291	int i, j;
292	z = blob_str(pReply);
	@@ -311,18 +311,18 @@
311	**
312	** For SSH we will leave the connection open.
313	*/
314	if( ! g.urlIsSsh ) closeConnection = 1; /* FIX ME */
315	if( closeConnection ){
316	transport_close();
317	}else{
318	transport_rewind();
319	}
320	return 0;
321
322	/*
323	** Jump to here if an error is seen.
324	*/
325	write_err:
326	transport_close();
327	return 1;
328	}
329

	--- src/http.c
	+++ src/http.c
	@@ -144,12 +144,12 @@
144	char zLine; / A single line of the reply header */
145	int i; /* Loop counter */
146	int isError = 0; /* True if the reply is an error message */
147	int isCompressed = 1; /* True if the reply is compressed */
148
149	if( transport_open(GLOBAL_URL()) ){
150	fossil_warning(transport_errmsg(GLOBAL_URL()));
151	return 1;
152	}
153
154	/* Construct the login card and prepare the complete payload */
155	blob_zero(&login);
	@@ -191,22 +191,22 @@
191	}
192
193	/*
194	** Send the request to the server.
195	*/
196	transport_send(GLOBAL_URL(), &hdr);
197	transport_send(GLOBAL_URL(), &payload);
198	blob_reset(&hdr);
199	blob_reset(&payload);
200	transport_flip(GLOBAL_URL());
201
202	/*
203	** Read and interpret the server reply
204	*/
205	closeConnection = 1;
206	iLength = -1;
207	while( (zLine = transport_receive_line(GLOBAL_URL()))!=0 && zLine[0]!=0 ){
208	/* printf("[%s]\n", zLine); fflush(stdout); */
209	if( fossil_strnicmp(zLine, "http/1.", 7)==0 ){
210	if( sscanf(zLine, "HTTP/1.%d %d", &iHttpVersion, &rc)!=2 ) goto write_err;
211	if( rc!=200 && rc!=302 ){
212	int ii;
	@@ -255,11 +255,11 @@
255	j -= 4;
256	zLine[j] = 0;
257	}
258	fossil_print("redirect to %s\n", &zLine[i]);
259	url_parse(&zLine[i], 0);
260	transport_close(GLOBAL_URL());
261	return http_exchange(pSend, pReply, useLogin, maxRedirect);
262	}else if( fossil_strnicmp(zLine, "content-type: ", 14)==0 ){
263	if( fossil_strnicmp(&zLine[14], "application/x-fossil-debug", -1)==0 ){
264	isCompressed = 0;
265	}else if( fossil_strnicmp(&zLine[14],
	@@ -282,11 +282,11 @@
282	/*
283	** Extract the reply payload that follows the header
284	*/
285	blob_zero(pReply);
286	blob_resize(pReply, iLength);
287	iLength = transport_receive(GLOBAL_URL(), blob_buffer(pReply), iLength);
288	blob_resize(pReply, iLength);
289	if( isError ){
290	char *z;
291	int i, j;
292	z = blob_str(pReply);
	@@ -311,18 +311,18 @@
311	**
312	** For SSH we will leave the connection open.
313	*/
314	if( ! g.urlIsSsh ) closeConnection = 1; /* FIX ME */
315	if( closeConnection ){
316	transport_close(GLOBAL_URL());
317	}else{
318	transport_rewind(GLOBAL_URL());
319	}
320	return 0;
321
322	/*
323	** Jump to here if an error is seen.
324	*/
325	write_err:
326	transport_close(GLOBAL_URL());
327	return 1;
328	}
329

M src/http_socket.c

+9 -8

		--- src/http_socket.c
		+++ src/http_socket.c
		@@ -131,29 +131,29 @@
131	131	** g.urlName Name of the server. Ex: www.fossil-scm.org
132	132	** g.urlPort TCP/IP port to use. Ex: 80
133	133	**
134	134	** Return the number of errors.
135	135	*/
136		-int socket_open(void){
	136	+int socket_open(UrlData *pUrlData){
137	137	static struct sockaddr_in addr; /* The server address */
138	138	static int addrIsInit = 0; /* True once addr is initialized */
139	139
140	140	socket_global_init();
141	141	if( !addrIsInit ){
142	142	addr.sin_family = AF_INET;
143		- addr.sin_port = htons(g.urlPort);
144		- (int)&addr.sin_addr = inet_addr(g.urlName);
	143	+ addr.sin_port = htons(pUrlData->port);
	144	+ (int)&addr.sin_addr = inet_addr(pUrlData->name);
145	145	if( -1 == (int)&addr.sin_addr ){
146	146	#ifndef FOSSIL_STATIC_LINK
147	147	struct hostent *pHost;
148		- pHost = gethostbyname(g.urlName);
	148	+ pHost = gethostbyname(pUrlData->name);
149	149	if( pHost!=0 ){
150	150	memcpy(&addr.sin_addr,pHost->h_addr_list[0],pHost->h_length);
151	151	}else
152	152	#endif
153	153	{
154		- socket_set_errmsg("can't resolve host name: %s", g.urlName);
	154	+ socket_set_errmsg("can't resolve host name: %s", pUrlData->name);
155	155	return 1;
156	156	}
157	157	}
158	158	addrIsInit = 1;
159	159
		@@ -167,11 +167,12 @@
167	167	if( iSocket<0 ){
168	168	socket_set_errmsg("cannot create a socket");
169	169	return 1;
170	170	}
171	171	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172		- socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
	172	+ socket_set_errmsg("cannot connect to host %s:%d", pUrlData->name,
	173	+ pUrlData->port);
173	174	socket_close();
174	175	return 1;
175	176	}
176	177	#if !defined(_WIN32)
177	178	signal(SIGPIPE, SIG_IGN);
		@@ -215,16 +216,16 @@
215	216	/*
216	217	** Attempt to resolve g.urlName to IP and setup g.zIpAddr so rcvfrom gets
217	218	** populated. For hostnames with more than one IP (or if overridden in
218	219	** ~/.ssh/config) the rcvfrom may not match the host to which we connect.
219	220	*/
220		-void socket_ssh_resolve_addr(void){
	221	+void socket_ssh_resolve_addr(UrlData *pUrlData){
221	222	struct hostent pHost; / Used to make best effort for rcvfrom */
222	223	struct sockaddr_in addr;
223	224
224	225	memset(&addr, 0, sizeof(addr));
225		- pHost = gethostbyname(g.urlName);
	226	+ pHost = gethostbyname(pUrlData->name);
226	227	if( pHost!=0 ){
227	228	memcpy(&addr.sin_addr,pHost->h_addr_list[0],pHost->h_length);
228	229	g.zIpAddr = mprintf("%s", inet_ntoa(addr.sin_addr));
229	230	}
230	231	}
231	232

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -131,29 +131,29 @@
131	** g.urlName Name of the server. Ex: www.fossil-scm.org
132	** g.urlPort TCP/IP port to use. Ex: 80
133	**
134	** Return the number of errors.
135	*/
136	int socket_open(void){
137	static struct sockaddr_in addr; /* The server address */
138	static int addrIsInit = 0; /* True once addr is initialized */
139
140	socket_global_init();
141	if( !addrIsInit ){
142	addr.sin_family = AF_INET;
143	addr.sin_port = htons(g.urlPort);
144	(int)&addr.sin_addr = inet_addr(g.urlName);
145	if( -1 == (int)&addr.sin_addr ){
146	#ifndef FOSSIL_STATIC_LINK
147	struct hostent *pHost;
148	pHost = gethostbyname(g.urlName);
149	if( pHost!=0 ){
150	memcpy(&addr.sin_addr,pHost->h_addr_list[0],pHost->h_length);
151	}else
152	#endif
153	{
154	socket_set_errmsg("can't resolve host name: %s", g.urlName);
155	return 1;
156	}
157	}
158	addrIsInit = 1;
159
	@@ -167,11 +167,12 @@
167	if( iSocket<0 ){
168	socket_set_errmsg("cannot create a socket");
169	return 1;
170	}
171	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);

173	socket_close();
174	return 1;
175	}
176	#if !defined(_WIN32)
177	signal(SIGPIPE, SIG_IGN);
	@@ -215,16 +216,16 @@
215	/*
216	** Attempt to resolve g.urlName to IP and setup g.zIpAddr so rcvfrom gets
217	** populated. For hostnames with more than one IP (or if overridden in
218	** ~/.ssh/config) the rcvfrom may not match the host to which we connect.
219	*/
220	void socket_ssh_resolve_addr(void){
221	struct hostent pHost; / Used to make best effort for rcvfrom */
222	struct sockaddr_in addr;
223
224	memset(&addr, 0, sizeof(addr));
225	pHost = gethostbyname(g.urlName);
226	if( pHost!=0 ){
227	memcpy(&addr.sin_addr,pHost->h_addr_list[0],pHost->h_length);
228	g.zIpAddr = mprintf("%s", inet_ntoa(addr.sin_addr));
229	}
230	}
231

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -131,29 +131,29 @@
131	** g.urlName Name of the server. Ex: www.fossil-scm.org
132	** g.urlPort TCP/IP port to use. Ex: 80
133	**
134	** Return the number of errors.
135	*/
136	int socket_open(UrlData *pUrlData){
137	static struct sockaddr_in addr; /* The server address */
138	static int addrIsInit = 0; /* True once addr is initialized */
139
140	socket_global_init();
141	if( !addrIsInit ){
142	addr.sin_family = AF_INET;
143	addr.sin_port = htons(pUrlData->port);
144	(int)&addr.sin_addr = inet_addr(pUrlData->name);
145	if( -1 == (int)&addr.sin_addr ){
146	#ifndef FOSSIL_STATIC_LINK
147	struct hostent *pHost;
148	pHost = gethostbyname(pUrlData->name);
149	if( pHost!=0 ){
150	memcpy(&addr.sin_addr,pHost->h_addr_list[0],pHost->h_length);
151	}else
152	#endif
153	{
154	socket_set_errmsg("can't resolve host name: %s", pUrlData->name);
155	return 1;
156	}
157	}
158	addrIsInit = 1;
159
	@@ -167,11 +167,12 @@
167	if( iSocket<0 ){
168	socket_set_errmsg("cannot create a socket");
169	return 1;
170	}
171	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172	socket_set_errmsg("cannot connect to host %s:%d", pUrlData->name,
173	pUrlData->port);
174	socket_close();
175	return 1;
176	}
177	#if !defined(_WIN32)
178	signal(SIGPIPE, SIG_IGN);
	@@ -215,16 +216,16 @@
216	/*
217	** Attempt to resolve g.urlName to IP and setup g.zIpAddr so rcvfrom gets
218	** populated. For hostnames with more than one IP (or if overridden in
219	** ~/.ssh/config) the rcvfrom may not match the host to which we connect.
220	*/
221	void socket_ssh_resolve_addr(UrlData *pUrlData){
222	struct hostent pHost; / Used to make best effort for rcvfrom */
223	struct sockaddr_in addr;
224
225	memset(&addr, 0, sizeof(addr));
226	pHost = gethostbyname(pUrlData->name);
227	if( pHost!=0 ){
228	memcpy(&addr.sin_addr,pHost->h_addr_list[0],pHost->h_length);
229	g.zIpAddr = mprintf("%s", inet_ntoa(addr.sin_addr));
230	}
231	}
232

M src/http_ssl.c

+17 -15

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -183,11 +183,11 @@
183	183	** g.urlName Name of the server. Ex: www.fossil-scm.org
184	184	** g.urlPort TCP/IP port to use. Ex: 80
185	185	**
186	186	** Return the number of errors.
187	187	*/
188		-int ssl_open(void){
	188	+int ssl_open(UrlData *pUrlData){
189	189	X509 *cert;
190	190	int hasSavedCertificate = 0;
191	191	int trusted = 0;
192	192	unsigned long e;
193	193
		@@ -194,11 +194,11 @@
194	194	ssl_global_init();
195	195
196	196	/* Get certificate for current server from global config and
197	197	* (if we have it in config) add it to certificate store.
198	198	*/
199		- cert = ssl_get_certificate(&trusted);
	199	+ cert = ssl_get_certificate(pUrlData, &trusted);
200	200	if ( cert!=NULL ){
201	201	X509_STORE_add_cert(SSL_CTX_get_cert_store(sslCtx), cert);
202	202	X509_free(cert);
203	203	hasSavedCertificate = 1;
204	204	}
		@@ -205,11 +205,11 @@
205	205
206	206	iBio = BIO_new_ssl_connect(sslCtx);
207	207	BIO_get_ssl(iBio, &ssl);
208	208
209	209	#if (SSLEAY_VERSION_NUMBER >= 0x00908070) && !defined(OPENSSL_NO_TLSEXT)
210		- if( !SSL_set_tlsext_host_name(ssl, g.urlName) ){
	210	+ if( !SSL_set_tlsext_host_name(ssl, pUrlData->name) ){
211	211	fossil_warning("WARNING: failed to set server name indication (SNI), "
212	212	"continuing without it.\n");
213	213	}
214	214	#endif
215	215
		@@ -218,23 +218,25 @@
218	218	ssl_set_errmsg("SSL: cannot open SSL (%s)",
219	219	ERR_reason_error_string(ERR_get_error()));
220	220	return 1;
221	221	}
222	222
223		- BIO_set_conn_hostname(iBio, g.urlName);
224		- BIO_set_conn_int_port(iBio, &g.urlPort);
	223	+ BIO_set_conn_hostname(iBio, pUrlData->name);
	224	+ BIO_set_conn_int_port(iBio, &pUrlData->port);
225	225
226	226	if( BIO_do_connect(iBio)<=0 ){
227	227	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
228		- g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error()));
	228	+ pUrlData->name, pUrlData->port,
	229	+ ERR_reason_error_string(ERR_get_error()));
229	230	ssl_close();
230	231	return 1;
231	232	}
232	233
233	234	if( BIO_do_handshake(iBio)<=0 ) {
234	235	ssl_set_errmsg("Error establishing SSL connection %s:%d (%s)",
235		- g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error()));
	236	+ pUrlData->name, pUrlData->port,
	237	+ ERR_reason_error_string(ERR_get_error()));
236	238	ssl_close();
237	239	return 1;
238	240	}
239	241	/* Check if certificate is valid */
240	242	cert = SSL_get_peer_certificate(ssl);
		@@ -281,11 +283,11 @@
281	283	" certificates list\n\n"
282	284	"If you are not expecting this message, answer no and "
283	285	"contact your server\nadministrator.\n\n"
284	286	"Accept certificate for host %s (a=always/y/N)? ",
285	287	X509_verify_cert_error_string(e), desc, warning,
286		- g.urlName);
	288	+ pUrlData->name);
287	289	BIO_free(mem);
288	290
289	291	prompt_user(prompt, &ans);
290	292	free(prompt);
291	293	cReply = blob_str(&ans)[0];
		@@ -302,11 +304,11 @@
302	304	&ans);
303	305	cReply = blob_str(&ans)[0];
304	306	trusted = ( cReply=='a' \|\| cReply=='A' );
305	307	blob_reset(&ans);
306	308	}
307		- ssl_save_certificate(cert, trusted);
	309	+ ssl_save_certificate(pUrlData, cert, trusted);
308	310	}
309	311	}
310	312
311	313	/* Set the Global.zIpAddr variable to the server we are talking to.
312	314	** This is used to populate the ipaddr column of the rcvfrom table,
		@@ -323,44 +325,44 @@
323	325	}
324	326
325	327	/*
326	328	** Save certificate to global config.
327	329	*/
328		-void ssl_save_certificate(X509 *cert, int trusted){
	330	+void ssl_save_certificate(UrlData pUrlData, X509 cert, int trusted){
329	331	BIO *mem;
330	332	char zCert, zHost;
331	333
332	334	mem = BIO_new(BIO_s_mem());
333	335	PEM_write_bio_X509(mem, cert);
334	336	BIO_write(mem, "", 1); /* nul-terminate mem buffer */
335	337	BIO_get_mem_data(mem, &zCert);
336		- zHost = mprintf("cert:%s", g.urlName);
	338	+ zHost = mprintf("cert:%s", pUrlData->name);
337	339	db_set(zHost, zCert, 1);
338	340	free(zHost);
339		- zHost = mprintf("trusted:%s", g.urlName);
	341	+ zHost = mprintf("trusted:%s", pUrlData->name);
340	342	db_set_int(zHost, trusted, 1);
341	343	free(zHost);
342	344	BIO_free(mem);
343	345	}
344	346
345	347	/*
346	348	** Get certificate for g.urlName from global config.
347	349	** Return NULL if no certificate found.
348	350	*/
349		-X509 ssl_get_certificate(int pTrusted){
	351	+X509 ssl_get_certificate(UrlData pUrlData, int *pTrusted){
350	352	char zHost, zCert;
351	353	BIO *mem;
352	354	X509 *cert;
353	355
354		- zHost = mprintf("cert:%s", g.urlName);
	356	+ zHost = mprintf("cert:%s", pUrlData->name);
355	357	zCert = db_get(zHost, NULL);
356	358	free(zHost);
357	359	if ( zCert==NULL )
358	360	return NULL;
359	361
360	362	if ( pTrusted!=0 ){
361		- zHost = mprintf("trusted:%s", g.urlName);
	363	+ zHost = mprintf("trusted:%s", pUrlData->name);
362	364	*pTrusted = db_get_int(zHost, 0);
363	365	free(zHost);
364	366	}
365	367
366	368	mem = BIO_new(BIO_s_mem());
367	369

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -183,11 +183,11 @@
183	** g.urlName Name of the server. Ex: www.fossil-scm.org
184	** g.urlPort TCP/IP port to use. Ex: 80
185	**
186	** Return the number of errors.
187	*/
188	int ssl_open(void){
189	X509 *cert;
190	int hasSavedCertificate = 0;
191	int trusted = 0;
192	unsigned long e;
193
	@@ -194,11 +194,11 @@
194	ssl_global_init();
195
196	/* Get certificate for current server from global config and
197	* (if we have it in config) add it to certificate store.
198	*/
199	cert = ssl_get_certificate(&trusted);
200	if ( cert!=NULL ){
201	X509_STORE_add_cert(SSL_CTX_get_cert_store(sslCtx), cert);
202	X509_free(cert);
203	hasSavedCertificate = 1;
204	}
	@@ -205,11 +205,11 @@
205
206	iBio = BIO_new_ssl_connect(sslCtx);
207	BIO_get_ssl(iBio, &ssl);
208
209	#if (SSLEAY_VERSION_NUMBER >= 0x00908070) && !defined(OPENSSL_NO_TLSEXT)
210	if( !SSL_set_tlsext_host_name(ssl, g.urlName) ){
211	fossil_warning("WARNING: failed to set server name indication (SNI), "
212	"continuing without it.\n");
213	}
214	#endif
215
	@@ -218,23 +218,25 @@
218	ssl_set_errmsg("SSL: cannot open SSL (%s)",
219	ERR_reason_error_string(ERR_get_error()));
220	return 1;
221	}
222
223	BIO_set_conn_hostname(iBio, g.urlName);
224	BIO_set_conn_int_port(iBio, &g.urlPort);
225
226	if( BIO_do_connect(iBio)<=0 ){
227	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
228	g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error()));

229	ssl_close();
230	return 1;
231	}
232
233	if( BIO_do_handshake(iBio)<=0 ) {
234	ssl_set_errmsg("Error establishing SSL connection %s:%d (%s)",
235	g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error()));

236	ssl_close();
237	return 1;
238	}
239	/* Check if certificate is valid */
240	cert = SSL_get_peer_certificate(ssl);
	@@ -281,11 +283,11 @@
281	" certificates list\n\n"
282	"If you are not expecting this message, answer no and "
283	"contact your server\nadministrator.\n\n"
284	"Accept certificate for host %s (a=always/y/N)? ",
285	X509_verify_cert_error_string(e), desc, warning,
286	g.urlName);
287	BIO_free(mem);
288
289	prompt_user(prompt, &ans);
290	free(prompt);
291	cReply = blob_str(&ans)[0];
	@@ -302,11 +304,11 @@
302	&ans);
303	cReply = blob_str(&ans)[0];
304	trusted = ( cReply=='a' \|\| cReply=='A' );
305	blob_reset(&ans);
306	}
307	ssl_save_certificate(cert, trusted);
308	}
309	}
310
311	/* Set the Global.zIpAddr variable to the server we are talking to.
312	** This is used to populate the ipaddr column of the rcvfrom table,
	@@ -323,44 +325,44 @@
323	}
324
325	/*
326	** Save certificate to global config.
327	*/
328	void ssl_save_certificate(X509 *cert, int trusted){
329	BIO *mem;
330	char zCert, zHost;
331
332	mem = BIO_new(BIO_s_mem());
333	PEM_write_bio_X509(mem, cert);
334	BIO_write(mem, "", 1); /* nul-terminate mem buffer */
335	BIO_get_mem_data(mem, &zCert);
336	zHost = mprintf("cert:%s", g.urlName);
337	db_set(zHost, zCert, 1);
338	free(zHost);
339	zHost = mprintf("trusted:%s", g.urlName);
340	db_set_int(zHost, trusted, 1);
341	free(zHost);
342	BIO_free(mem);
343	}
344
345	/*
346	** Get certificate for g.urlName from global config.
347	** Return NULL if no certificate found.
348	*/
349	X509 ssl_get_certificate(int pTrusted){
350	char zHost, zCert;
351	BIO *mem;
352	X509 *cert;
353
354	zHost = mprintf("cert:%s", g.urlName);
355	zCert = db_get(zHost, NULL);
356	free(zHost);
357	if ( zCert==NULL )
358	return NULL;
359
360	if ( pTrusted!=0 ){
361	zHost = mprintf("trusted:%s", g.urlName);
362	*pTrusted = db_get_int(zHost, 0);
363	free(zHost);
364	}
365
366	mem = BIO_new(BIO_s_mem());
367

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -183,11 +183,11 @@
183	** g.urlName Name of the server. Ex: www.fossil-scm.org
184	** g.urlPort TCP/IP port to use. Ex: 80
185	**
186	** Return the number of errors.
187	*/
188	int ssl_open(UrlData *pUrlData){
189	X509 *cert;
190	int hasSavedCertificate = 0;
191	int trusted = 0;
192	unsigned long e;
193
	@@ -194,11 +194,11 @@
194	ssl_global_init();
195
196	/* Get certificate for current server from global config and
197	* (if we have it in config) add it to certificate store.
198	*/
199	cert = ssl_get_certificate(pUrlData, &trusted);
200	if ( cert!=NULL ){
201	X509_STORE_add_cert(SSL_CTX_get_cert_store(sslCtx), cert);
202	X509_free(cert);
203	hasSavedCertificate = 1;
204	}
	@@ -205,11 +205,11 @@
205
206	iBio = BIO_new_ssl_connect(sslCtx);
207	BIO_get_ssl(iBio, &ssl);
208
209	#if (SSLEAY_VERSION_NUMBER >= 0x00908070) && !defined(OPENSSL_NO_TLSEXT)
210	if( !SSL_set_tlsext_host_name(ssl, pUrlData->name) ){
211	fossil_warning("WARNING: failed to set server name indication (SNI), "
212	"continuing without it.\n");
213	}
214	#endif
215
	@@ -218,23 +218,25 @@
218	ssl_set_errmsg("SSL: cannot open SSL (%s)",
219	ERR_reason_error_string(ERR_get_error()));
220	return 1;
221	}
222
223	BIO_set_conn_hostname(iBio, pUrlData->name);
224	BIO_set_conn_int_port(iBio, &pUrlData->port);
225
226	if( BIO_do_connect(iBio)<=0 ){
227	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
228	pUrlData->name, pUrlData->port,
229	ERR_reason_error_string(ERR_get_error()));
230	ssl_close();
231	return 1;
232	}
233
234	if( BIO_do_handshake(iBio)<=0 ) {
235	ssl_set_errmsg("Error establishing SSL connection %s:%d (%s)",
236	pUrlData->name, pUrlData->port,
237	ERR_reason_error_string(ERR_get_error()));
238	ssl_close();
239	return 1;
240	}
241	/* Check if certificate is valid */
242	cert = SSL_get_peer_certificate(ssl);
	@@ -281,11 +283,11 @@
283	" certificates list\n\n"
284	"If you are not expecting this message, answer no and "
285	"contact your server\nadministrator.\n\n"
286	"Accept certificate for host %s (a=always/y/N)? ",
287	X509_verify_cert_error_string(e), desc, warning,
288	pUrlData->name);
289	BIO_free(mem);
290
291	prompt_user(prompt, &ans);
292	free(prompt);
293	cReply = blob_str(&ans)[0];
	@@ -302,11 +304,11 @@
304	&ans);
305	cReply = blob_str(&ans)[0];
306	trusted = ( cReply=='a' \|\| cReply=='A' );
307	blob_reset(&ans);
308	}
309	ssl_save_certificate(pUrlData, cert, trusted);
310	}
311	}
312
313	/* Set the Global.zIpAddr variable to the server we are talking to.
314	** This is used to populate the ipaddr column of the rcvfrom table,
	@@ -323,44 +325,44 @@
325	}
326
327	/*
328	** Save certificate to global config.
329	*/
330	void ssl_save_certificate(UrlData pUrlData, X509 cert, int trusted){
331	BIO *mem;
332	char zCert, zHost;
333
334	mem = BIO_new(BIO_s_mem());
335	PEM_write_bio_X509(mem, cert);
336	BIO_write(mem, "", 1); /* nul-terminate mem buffer */
337	BIO_get_mem_data(mem, &zCert);
338	zHost = mprintf("cert:%s", pUrlData->name);
339	db_set(zHost, zCert, 1);
340	free(zHost);
341	zHost = mprintf("trusted:%s", pUrlData->name);
342	db_set_int(zHost, trusted, 1);
343	free(zHost);
344	BIO_free(mem);
345	}
346
347	/*
348	** Get certificate for g.urlName from global config.
349	** Return NULL if no certificate found.
350	*/
351	X509 ssl_get_certificate(UrlData pUrlData, int *pTrusted){
352	char zHost, zCert;
353	BIO *mem;
354	X509 *cert;
355
356	zHost = mprintf("cert:%s", pUrlData->name);
357	zCert = db_get(zHost, NULL);
358	free(zHost);
359	if ( zCert==NULL )
360	return NULL;
361
362	if ( pTrusted!=0 ){
363	zHost = mprintf("trusted:%s", pUrlData->name);
364	*pTrusted = db_get_int(zHost, 0);
365	free(zHost);
366	}
367
368	mem = BIO_new(BIO_s_mem());
369

M src/http_transport.c

+46 -46

		--- src/http_transport.c
		+++ src/http_transport.c
		@@ -52,13 +52,13 @@
52	52
53	53
54	54	/*
55	55	** Return the current transport error message.
56	56	*/
57		-const char *transport_errmsg(void){
	57	+const char transport_errmsg(UrlData pUrlData){
58	58	#ifdef FOSSIL_ENABLE_SSL
59		- if( g.urlIsHttps ){
	59	+ if( pUrlData->isHttps ){
60	60	return ssl_errmsg();
61	61	}
62	62	#endif
63	63	return socket_errmsg();
64	64	}
		@@ -86,47 +86,47 @@
86	86	#endif
87	87
88	88	/*
89	89	** SSH initialization of the transport layer
90	90	*/
91		-int transport_ssh_open(void){
	91	+int transport_ssh_open(UrlData *pUrlData){
92	92	/* For SSH we need to create and run SSH fossil http
93	93	** to talk to the remote machine.
94	94	*/
95	95	const char zSsh; / The base SSH command */
96	96	Blob zCmd; /* The SSH command */
97	97	char zHost; / The host name to contact */
98	98	int n; /* Size of prefix string */
99	99
100		- socket_ssh_resolve_addr();
	100	+ socket_ssh_resolve_addr(pUrlData);
101	101	zSsh = db_get("ssh-command", zDefaultSshCmd);
102	102	blob_init(&zCmd, zSsh, -1);
103		- if( g.urlPort!=g.urlDfltPort && g.urlPort ){
	103	+ if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){
104	104	#ifdef __MINGW32__
105		- blob_appendf(&zCmd, " -P %d", g.urlPort);
	105	+ blob_appendf(&zCmd, " -P %d", pUrlData->port);
106	106	#else
107		- blob_appendf(&zCmd, " -p %d", g.urlPort);
	107	+ blob_appendf(&zCmd, " -p %d", pUrlData->port);
108	108	#endif
109	109	}
110	110	if( g.fSshTrace ){
111	111	fossil_force_newline();
112	112	fossil_print("%s", blob_str(&zCmd)); /* Show the base of the SSH command */
113	113	}
114		- if( g.urlUser && g.urlUser[0] ){
115		- zHost = mprintf("%s@%s", g.urlUser, g.urlName);
	114	+ if( pUrlData->user && pUrlData->user[0] ){
	115	+ zHost = mprintf("%s@%s", pUrlData->user, pUrlData->name);
116	116	}else{
117		- zHost = mprintf("%s", g.urlName);
	117	+ zHost = mprintf("%s", pUrlData->name);
118	118	}
119	119	n = blob_size(&zCmd);
120	120	blob_append(&zCmd, " ", 1);
121	121	shell_escape(&zCmd, zHost);
122	122	blob_append(&zCmd, " ", 1);
123		- shell_escape(&zCmd, mprintf("%s", g.urlFossil));
	123	+ shell_escape(&zCmd, mprintf("%s", pUrlData->fossil));
124	124	blob_append(&zCmd, " test-http", 10);
125		- if( g.urlPath && g.urlPath[0] ){
	125	+ if( pUrlData->path && pUrlData->path[0] ){
126	126	blob_append(&zCmd, " ", 1);
127		- shell_escape(&zCmd, mprintf("%s", g.urlPath));
	127	+ shell_escape(&zCmd, mprintf("%s", pUrlData->path));
128	128	}
129	129	if( g.fSshTrace ){
130	130	fossil_print("%s\n", blob_str(&zCmd)+n); /* Show tail of SSH command */
131	131	}
132	132	free(zHost);
		@@ -146,25 +146,25 @@
146	146	** g.urlPort TCP/IP port. Ex: 80
147	147	** g.urlIsHttps Use TLS for the connection
148	148	**
149	149	** Return the number of errors.
150	150	*/
151		-int transport_open(void){
	151	+int transport_open(UrlData *pUrlData){
152	152	int rc = 0;
153	153	if( transport.isOpen==0 ){
154		- if( g.urlIsSsh ){
155		- rc = transport_ssh_open();
	154	+ if( pUrlData->isSsh ){
	155	+ rc = transport_ssh_open(pUrlData);
156	156	if( rc==0 ) transport.isOpen = 1;
157		- }else if( g.urlIsHttps ){
	157	+ }else if( pUrlData->isHttps ){
158	158	#ifdef FOSSIL_ENABLE_SSL
159		- rc = ssl_open();
	159	+ rc = ssl_open(pUrlData);
160	160	if( rc==0 ) transport.isOpen = 1;
161	161	#else
162	162	socket_set_errmsg("HTTPS: Fossil has been compiled without SSL support");
163	163	rc = 1;
164	164	#endif
165		- }else if( g.urlIsFile ){
	165	+ }else if( pUrlData->isFile ){
166	166	sqlite3_uint64 iRandId;
167	167	sqlite3_randomness(sizeof(iRandId), &iRandId);
168	168	transport.zOutFile = mprintf("%s-%llu-out.http",
169	169	g.zRepositoryName, iRandId);
170	170	transport.zInFile = mprintf("%s-%llu-in.http",
		@@ -173,21 +173,21 @@
173	173	if( transport.pFile==0 ){
174	174	fossil_fatal("cannot output temporary file: %s", transport.zOutFile);
175	175	}
176	176	transport.isOpen = 1;
177	177	}else{
178		- rc = socket_open();
	178	+ rc = socket_open(pUrlData);
179	179	if( rc==0 ) transport.isOpen = 1;
180	180	}
181	181	}
182	182	return rc;
183	183	}
184	184
185	185	/*
186	186	** Close the current connection
187	187	*/
188		-void transport_close(void){
	188	+void transport_close(UrlData *pUrlData){
189	189	if( transport.isOpen ){
190	190	free(transport.pBuf);
191	191	transport.pBuf = 0;
192	192	transport.nAlloc = 0;
193	193	transport.nUsed = 0;
		@@ -194,17 +194,17 @@
194	194	transport.iCursor = 0;
195	195	if( transport.pLog ){
196	196	fclose(transport.pLog);
197	197	transport.pLog = 0;
198	198	}
199		- if( g.urlIsSsh ){
	199	+ if( pUrlData->isSsh ){
200	200	transport_ssh_close();
201		- }else if( g.urlIsHttps ){
	201	+ }else if( pUrlData->isHttps ){
202	202	#ifdef FOSSIL_ENABLE_SSL
203	203	ssl_close();
204	204	#endif
205		- }else if( g.urlIsFile ){
	205	+ }else if( pUrlData->isFile ){
206	206	if( transport.pFile ){
207	207	fclose(transport.pFile);
208	208	transport.pFile = 0;
209	209	}
210	210	file_delete(transport.zInFile);
		@@ -219,28 +219,28 @@
219	219	}
220	220
221	221	/*
222	222	** Send content over the wire.
223	223	*/
224		-void transport_send(Blob *toSend){
	224	+void transport_send(UrlData pUrlData, Blob toSend){
225	225	char *z = blob_buffer(toSend);
226	226	int n = blob_size(toSend);
227	227	transport.nSent += n;
228		- if( g.urlIsSsh ){
	228	+ if( pUrlData->isSsh ){
229	229	fwrite(z, 1, n, sshOut);
230	230	fflush(sshOut);
231		- }else if( g.urlIsHttps ){
	231	+ }else if( pUrlData->isHttps ){
232	232	#ifdef FOSSIL_ENABLE_SSL
233	233	int sent;
234	234	while( n>0 ){
235	235	sent = ssl_send(0, z, n);
236	236	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
237	237	if( sent<=0 ) break;
238	238	n -= sent;
239	239	}
240	240	#endif
241		- }else if( g.urlIsFile ){
	241	+ }else if( pUrlData->isFile ){
242	242	fwrite(z, 1, n, transport.pFile);
243	243	}else{
244	244	int sent;
245	245	while( n>0 ){
246	246	sent = socket_send(0, z, n);
		@@ -253,16 +253,16 @@
253	253
254	254	/*
255	255	** This routine is called when the outbound message is complete and
256	256	** it is time to being receiving a reply.
257	257	*/
258		-void transport_flip(void){
259		- if( g.urlIsFile ){
	258	+void transport_flip(UrlData *pUrlData){
	259	+ if( pUrlData->isFile ){
260	260	char *zCmd;
261	261	fclose(transport.pFile);
262	262	zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1 --localauth",
263		- g.nameOfExe, g.urlName, transport.zOutFile, transport.zInFile
	263	+ g.nameOfExe, pUrlData->name, transport.zOutFile, transport.zInFile
264	264	);
265	265	fossil_system(zCmd);
266	266	free(zCmd);
267	267	transport.pFile = fossil_fopen(transport.zInFile, "rb");
268	268	}
		@@ -282,21 +282,21 @@
282	282
283	283	/*
284	284	** This routine is called when the inbound message has been received
285	285	** and it is time to start sending again.
286	286	*/
287		-void transport_rewind(void){
288		- if( g.urlIsFile ){
289		- transport_close();
	287	+void transport_rewind(UrlData *pUrlData){
	288	+ if( pUrlData->isFile ){
	289	+ transport_close(pUrlData);
290	290	}
291	291	}
292	292
293	293	/*
294	294	** Read N bytes of content directly from the wire and write into
295	295	** the buffer.
296	296	*/
297		-static int transport_fetch(char *zBuf, int N){
	297	+static int transport_fetch(UrlData pUrlData, char zBuf, int N){
298	298	int got;
299	299	if( sshIn ){
300	300	int x;
301	301	int wanted = N;
302	302	got = 0;
		@@ -304,17 +304,17 @@
304	304	x = read(sshIn, &zBuf[got], wanted);
305	305	if( x<=0 ) break;
306	306	got += x;
307	307	wanted -= x;
308	308	}
309		- }else if( g.urlIsHttps ){
	309	+ }else if( pUrlData->isHttps ){
310	310	#ifdef FOSSIL_ENABLE_SSL
311	311	got = ssl_receive(0, zBuf, N);
312	312	#else
313	313	got = 0;
314	314	#endif
315		- }else if( g.urlIsFile ){
	315	+ }else if( pUrlData->isFile ){
316	316	got = fread(zBuf, 1, N, transport.pFile);
317	317	}else{
318	318	got = socket_receive(0, zBuf, N);
319	319	}
320	320	/* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
		@@ -327,11 +327,11 @@
327	327
328	328	/*
329	329	** Read N bytes of content from the wire and store in the supplied buffer.
330	330	** Return the number of bytes actually received.
331	331	*/
332		-int transport_receive(char *zBuf, int N){
	332	+int transport_receive(UrlData pUrlData, char zBuf, int N){
333	333	int onHand; /* Bytes current held in the transport buffer */
334	334	int nByte = 0; /* Bytes of content received */
335	335
336	336	onHand = transport.nUsed - transport.iCursor;
337	337	if( g.fSshTrace){
		@@ -351,11 +351,11 @@
351	351	N -= toMove;
352	352	zBuf += toMove;
353	353	nByte += toMove;
354	354	}
355	355	if( N>0 ){
356		- int got = transport_fetch(zBuf, N);
	356	+ int got = transport_fetch(pUrlData, zBuf, N);
357	357	if( got>0 ){
358	358	nByte += got;
359	359	transport.nRcvd += got;
360	360	}
361	361	}
		@@ -366,11 +366,11 @@
366	366	/*
367	367	** Load up to N new bytes of content into the transport.pBuf buffer.
368	368	** The buffer itself might be moved. And the transport.iCursor value
369	369	** might be reset to 0.
370	370	*/
371		-static void transport_load_buffer(int N){
	371	+static void transport_load_buffer(UrlData *pUrlData, int N){
372	372	int i, j;
373	373	if( transport.nAlloc==0 ){
374	374	transport.nAlloc = N;
375	375	transport.pBuf = fossil_malloc( N );
376	376	transport.iCursor = 0;
		@@ -388,11 +388,11 @@
388	388	transport.nAlloc = transport.nUsed + N;
389	389	pNew = fossil_realloc(transport.pBuf, transport.nAlloc);
390	390	transport.pBuf = pNew;
391	391	}
392	392	if( N>0 ){
393		- i = transport_fetch(&transport.pBuf[transport.nUsed], N);
	393	+ i = transport_fetch(pUrlData, &transport.pBuf[transport.nUsed], N);
394	394	if( i>0 ){
395	395	transport.nRcvd += i;
396	396	transport.nUsed += i;
397	397	}
398	398	}
		@@ -404,18 +404,18 @@
404	404	** from the received line and zero-terminate the result. Return a pointer
405	405	** to the line.
406	406	**
407	407	** Each call to this routine potentially overwrites the returned buffer.
408	408	*/
409		-char *transport_receive_line(void){
	409	+char transport_receive_line(UrlData pUrlData){
410	410	int i;
411	411	int iStart;
412	412
413	413	i = iStart = transport.iCursor;
414	414	while(1){
415	415	if( i >= transport.nUsed ){
416		- transport_load_buffer(g.urlIsSsh ? 2 : 1000);
	416	+ transport_load_buffer(pUrlData, pUrlData->isSsh ? 2 : 1000);
417	417	i -= iStart;
418	418	iStart = 0;
419	419	if( i >= transport.nUsed ){
420	420	transport.pBuf[i] = 0;
421	421	transport.iCursor = i;
		@@ -437,15 +437,15 @@
437	437	}
438	438
439	439	/*
440	440	** Global transport shutdown
441	441	*/
442		-void transport_global_shutdown(void){
443		- if( g.urlIsSsh ){
	442	+void transport_global_shutdown(UrlData *pUrlData){
	443	+ if( pUrlData->isSsh ){
444	444	transport_ssh_close();
445	445	}
446		- if( g.urlIsHttps ){
	446	+ if( pUrlData->isHttps ){
447	447	#ifdef FOSSIL_ENABLE_SSL
448	448	ssl_global_shutdown();
449	449	#endif
450	450	}else{
451	451	socket_global_shutdown();
452	452

	--- src/http_transport.c
	+++ src/http_transport.c
	@@ -52,13 +52,13 @@
52
53
54	/*
55	** Return the current transport error message.
56	*/
57	const char *transport_errmsg(void){
58	#ifdef FOSSIL_ENABLE_SSL
59	if( g.urlIsHttps ){
60	return ssl_errmsg();
61	}
62	#endif
63	return socket_errmsg();
64	}
	@@ -86,47 +86,47 @@
86	#endif
87
88	/*
89	** SSH initialization of the transport layer
90	*/
91	int transport_ssh_open(void){
92	/* For SSH we need to create and run SSH fossil http
93	** to talk to the remote machine.
94	*/
95	const char zSsh; / The base SSH command */
96	Blob zCmd; /* The SSH command */
97	char zHost; / The host name to contact */
98	int n; /* Size of prefix string */
99
100	socket_ssh_resolve_addr();
101	zSsh = db_get("ssh-command", zDefaultSshCmd);
102	blob_init(&zCmd, zSsh, -1);
103	if( g.urlPort!=g.urlDfltPort && g.urlPort ){
104	#ifdef __MINGW32__
105	blob_appendf(&zCmd, " -P %d", g.urlPort);
106	#else
107	blob_appendf(&zCmd, " -p %d", g.urlPort);
108	#endif
109	}
110	if( g.fSshTrace ){
111	fossil_force_newline();
112	fossil_print("%s", blob_str(&zCmd)); /* Show the base of the SSH command */
113	}
114	if( g.urlUser && g.urlUser[0] ){
115	zHost = mprintf("%s@%s", g.urlUser, g.urlName);
116	}else{
117	zHost = mprintf("%s", g.urlName);
118	}
119	n = blob_size(&zCmd);
120	blob_append(&zCmd, " ", 1);
121	shell_escape(&zCmd, zHost);
122	blob_append(&zCmd, " ", 1);
123	shell_escape(&zCmd, mprintf("%s", g.urlFossil));
124	blob_append(&zCmd, " test-http", 10);
125	if( g.urlPath && g.urlPath[0] ){
126	blob_append(&zCmd, " ", 1);
127	shell_escape(&zCmd, mprintf("%s", g.urlPath));
128	}
129	if( g.fSshTrace ){
130	fossil_print("%s\n", blob_str(&zCmd)+n); /* Show tail of SSH command */
131	}
132	free(zHost);
	@@ -146,25 +146,25 @@
146	** g.urlPort TCP/IP port. Ex: 80
147	** g.urlIsHttps Use TLS for the connection
148	**
149	** Return the number of errors.
150	*/
151	int transport_open(void){
152	int rc = 0;
153	if( transport.isOpen==0 ){
154	if( g.urlIsSsh ){
155	rc = transport_ssh_open();
156	if( rc==0 ) transport.isOpen = 1;
157	}else if( g.urlIsHttps ){
158	#ifdef FOSSIL_ENABLE_SSL
159	rc = ssl_open();
160	if( rc==0 ) transport.isOpen = 1;
161	#else
162	socket_set_errmsg("HTTPS: Fossil has been compiled without SSL support");
163	rc = 1;
164	#endif
165	}else if( g.urlIsFile ){
166	sqlite3_uint64 iRandId;
167	sqlite3_randomness(sizeof(iRandId), &iRandId);
168	transport.zOutFile = mprintf("%s-%llu-out.http",
169	g.zRepositoryName, iRandId);
170	transport.zInFile = mprintf("%s-%llu-in.http",
	@@ -173,21 +173,21 @@
173	if( transport.pFile==0 ){
174	fossil_fatal("cannot output temporary file: %s", transport.zOutFile);
175	}
176	transport.isOpen = 1;
177	}else{
178	rc = socket_open();
179	if( rc==0 ) transport.isOpen = 1;
180	}
181	}
182	return rc;
183	}
184
185	/*
186	** Close the current connection
187	*/
188	void transport_close(void){
189	if( transport.isOpen ){
190	free(transport.pBuf);
191	transport.pBuf = 0;
192	transport.nAlloc = 0;
193	transport.nUsed = 0;
	@@ -194,17 +194,17 @@
194	transport.iCursor = 0;
195	if( transport.pLog ){
196	fclose(transport.pLog);
197	transport.pLog = 0;
198	}
199	if( g.urlIsSsh ){
200	transport_ssh_close();
201	}else if( g.urlIsHttps ){
202	#ifdef FOSSIL_ENABLE_SSL
203	ssl_close();
204	#endif
205	}else if( g.urlIsFile ){
206	if( transport.pFile ){
207	fclose(transport.pFile);
208	transport.pFile = 0;
209	}
210	file_delete(transport.zInFile);
	@@ -219,28 +219,28 @@
219	}
220
221	/*
222	** Send content over the wire.
223	*/
224	void transport_send(Blob *toSend){
225	char *z = blob_buffer(toSend);
226	int n = blob_size(toSend);
227	transport.nSent += n;
228	if( g.urlIsSsh ){
229	fwrite(z, 1, n, sshOut);
230	fflush(sshOut);
231	}else if( g.urlIsHttps ){
232	#ifdef FOSSIL_ENABLE_SSL
233	int sent;
234	while( n>0 ){
235	sent = ssl_send(0, z, n);
236	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
237	if( sent<=0 ) break;
238	n -= sent;
239	}
240	#endif
241	}else if( g.urlIsFile ){
242	fwrite(z, 1, n, transport.pFile);
243	}else{
244	int sent;
245	while( n>0 ){
246	sent = socket_send(0, z, n);
	@@ -253,16 +253,16 @@
253
254	/*
255	** This routine is called when the outbound message is complete and
256	** it is time to being receiving a reply.
257	*/
258	void transport_flip(void){
259	if( g.urlIsFile ){
260	char *zCmd;
261	fclose(transport.pFile);
262	zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1 --localauth",
263	g.nameOfExe, g.urlName, transport.zOutFile, transport.zInFile
264	);
265	fossil_system(zCmd);
266	free(zCmd);
267	transport.pFile = fossil_fopen(transport.zInFile, "rb");
268	}
	@@ -282,21 +282,21 @@
282
283	/*
284	** This routine is called when the inbound message has been received
285	** and it is time to start sending again.
286	*/
287	void transport_rewind(void){
288	if( g.urlIsFile ){
289	transport_close();
290	}
291	}
292
293	/*
294	** Read N bytes of content directly from the wire and write into
295	** the buffer.
296	*/
297	static int transport_fetch(char *zBuf, int N){
298	int got;
299	if( sshIn ){
300	int x;
301	int wanted = N;
302	got = 0;
	@@ -304,17 +304,17 @@
304	x = read(sshIn, &zBuf[got], wanted);
305	if( x<=0 ) break;
306	got += x;
307	wanted -= x;
308	}
309	}else if( g.urlIsHttps ){
310	#ifdef FOSSIL_ENABLE_SSL
311	got = ssl_receive(0, zBuf, N);
312	#else
313	got = 0;
314	#endif
315	}else if( g.urlIsFile ){
316	got = fread(zBuf, 1, N, transport.pFile);
317	}else{
318	got = socket_receive(0, zBuf, N);
319	}
320	/* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
	@@ -327,11 +327,11 @@
327
328	/*
329	** Read N bytes of content from the wire and store in the supplied buffer.
330	** Return the number of bytes actually received.
331	*/
332	int transport_receive(char *zBuf, int N){
333	int onHand; /* Bytes current held in the transport buffer */
334	int nByte = 0; /* Bytes of content received */
335
336	onHand = transport.nUsed - transport.iCursor;
337	if( g.fSshTrace){
	@@ -351,11 +351,11 @@
351	N -= toMove;
352	zBuf += toMove;
353	nByte += toMove;
354	}
355	if( N>0 ){
356	int got = transport_fetch(zBuf, N);
357	if( got>0 ){
358	nByte += got;
359	transport.nRcvd += got;
360	}
361	}
	@@ -366,11 +366,11 @@
366	/*
367	** Load up to N new bytes of content into the transport.pBuf buffer.
368	** The buffer itself might be moved. And the transport.iCursor value
369	** might be reset to 0.
370	*/
371	static void transport_load_buffer(int N){
372	int i, j;
373	if( transport.nAlloc==0 ){
374	transport.nAlloc = N;
375	transport.pBuf = fossil_malloc( N );
376	transport.iCursor = 0;
	@@ -388,11 +388,11 @@
388	transport.nAlloc = transport.nUsed + N;
389	pNew = fossil_realloc(transport.pBuf, transport.nAlloc);
390	transport.pBuf = pNew;
391	}
392	if( N>0 ){
393	i = transport_fetch(&transport.pBuf[transport.nUsed], N);
394	if( i>0 ){
395	transport.nRcvd += i;
396	transport.nUsed += i;
397	}
398	}
	@@ -404,18 +404,18 @@
404	** from the received line and zero-terminate the result. Return a pointer
405	** to the line.
406	**
407	** Each call to this routine potentially overwrites the returned buffer.
408	*/
409	char *transport_receive_line(void){
410	int i;
411	int iStart;
412
413	i = iStart = transport.iCursor;
414	while(1){
415	if( i >= transport.nUsed ){
416	transport_load_buffer(g.urlIsSsh ? 2 : 1000);
417	i -= iStart;
418	iStart = 0;
419	if( i >= transport.nUsed ){
420	transport.pBuf[i] = 0;
421	transport.iCursor = i;
	@@ -437,15 +437,15 @@
437	}
438
439	/*
440	** Global transport shutdown
441	*/
442	void transport_global_shutdown(void){
443	if( g.urlIsSsh ){
444	transport_ssh_close();
445	}
446	if( g.urlIsHttps ){
447	#ifdef FOSSIL_ENABLE_SSL
448	ssl_global_shutdown();
449	#endif
450	}else{
451	socket_global_shutdown();
452

	--- src/http_transport.c
	+++ src/http_transport.c
	@@ -52,13 +52,13 @@
52
53
54	/*
55	** Return the current transport error message.
56	*/
57	const char transport_errmsg(UrlData pUrlData){
58	#ifdef FOSSIL_ENABLE_SSL
59	if( pUrlData->isHttps ){
60	return ssl_errmsg();
61	}
62	#endif
63	return socket_errmsg();
64	}
	@@ -86,47 +86,47 @@
86	#endif
87
88	/*
89	** SSH initialization of the transport layer
90	*/
91	int transport_ssh_open(UrlData *pUrlData){
92	/* For SSH we need to create and run SSH fossil http
93	** to talk to the remote machine.
94	*/
95	const char zSsh; / The base SSH command */
96	Blob zCmd; /* The SSH command */
97	char zHost; / The host name to contact */
98	int n; /* Size of prefix string */
99
100	socket_ssh_resolve_addr(pUrlData);
101	zSsh = db_get("ssh-command", zDefaultSshCmd);
102	blob_init(&zCmd, zSsh, -1);
103	if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){
104	#ifdef __MINGW32__
105	blob_appendf(&zCmd, " -P %d", pUrlData->port);
106	#else
107	blob_appendf(&zCmd, " -p %d", pUrlData->port);
108	#endif
109	}
110	if( g.fSshTrace ){
111	fossil_force_newline();
112	fossil_print("%s", blob_str(&zCmd)); /* Show the base of the SSH command */
113	}
114	if( pUrlData->user && pUrlData->user[0] ){
115	zHost = mprintf("%s@%s", pUrlData->user, pUrlData->name);
116	}else{
117	zHost = mprintf("%s", pUrlData->name);
118	}
119	n = blob_size(&zCmd);
120	blob_append(&zCmd, " ", 1);
121	shell_escape(&zCmd, zHost);
122	blob_append(&zCmd, " ", 1);
123	shell_escape(&zCmd, mprintf("%s", pUrlData->fossil));
124	blob_append(&zCmd, " test-http", 10);
125	if( pUrlData->path && pUrlData->path[0] ){
126	blob_append(&zCmd, " ", 1);
127	shell_escape(&zCmd, mprintf("%s", pUrlData->path));
128	}
129	if( g.fSshTrace ){
130	fossil_print("%s\n", blob_str(&zCmd)+n); /* Show tail of SSH command */
131	}
132	free(zHost);
	@@ -146,25 +146,25 @@
146	** g.urlPort TCP/IP port. Ex: 80
147	** g.urlIsHttps Use TLS for the connection
148	**
149	** Return the number of errors.
150	*/
151	int transport_open(UrlData *pUrlData){
152	int rc = 0;
153	if( transport.isOpen==0 ){
154	if( pUrlData->isSsh ){
155	rc = transport_ssh_open(pUrlData);
156	if( rc==0 ) transport.isOpen = 1;
157	}else if( pUrlData->isHttps ){
158	#ifdef FOSSIL_ENABLE_SSL
159	rc = ssl_open(pUrlData);
160	if( rc==0 ) transport.isOpen = 1;
161	#else
162	socket_set_errmsg("HTTPS: Fossil has been compiled without SSL support");
163	rc = 1;
164	#endif
165	}else if( pUrlData->isFile ){
166	sqlite3_uint64 iRandId;
167	sqlite3_randomness(sizeof(iRandId), &iRandId);
168	transport.zOutFile = mprintf("%s-%llu-out.http",
169	g.zRepositoryName, iRandId);
170	transport.zInFile = mprintf("%s-%llu-in.http",
	@@ -173,21 +173,21 @@
173	if( transport.pFile==0 ){
174	fossil_fatal("cannot output temporary file: %s", transport.zOutFile);
175	}
176	transport.isOpen = 1;
177	}else{
178	rc = socket_open(pUrlData);
179	if( rc==0 ) transport.isOpen = 1;
180	}
181	}
182	return rc;
183	}
184
185	/*
186	** Close the current connection
187	*/
188	void transport_close(UrlData *pUrlData){
189	if( transport.isOpen ){
190	free(transport.pBuf);
191	transport.pBuf = 0;
192	transport.nAlloc = 0;
193	transport.nUsed = 0;
	@@ -194,17 +194,17 @@
194	transport.iCursor = 0;
195	if( transport.pLog ){
196	fclose(transport.pLog);
197	transport.pLog = 0;
198	}
199	if( pUrlData->isSsh ){
200	transport_ssh_close();
201	}else if( pUrlData->isHttps ){
202	#ifdef FOSSIL_ENABLE_SSL
203	ssl_close();
204	#endif
205	}else if( pUrlData->isFile ){
206	if( transport.pFile ){
207	fclose(transport.pFile);
208	transport.pFile = 0;
209	}
210	file_delete(transport.zInFile);
	@@ -219,28 +219,28 @@
219	}
220
221	/*
222	** Send content over the wire.
223	*/
224	void transport_send(UrlData pUrlData, Blob toSend){
225	char *z = blob_buffer(toSend);
226	int n = blob_size(toSend);
227	transport.nSent += n;
228	if( pUrlData->isSsh ){
229	fwrite(z, 1, n, sshOut);
230	fflush(sshOut);
231	}else if( pUrlData->isHttps ){
232	#ifdef FOSSIL_ENABLE_SSL
233	int sent;
234	while( n>0 ){
235	sent = ssl_send(0, z, n);
236	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
237	if( sent<=0 ) break;
238	n -= sent;
239	}
240	#endif
241	}else if( pUrlData->isFile ){
242	fwrite(z, 1, n, transport.pFile);
243	}else{
244	int sent;
245	while( n>0 ){
246	sent = socket_send(0, z, n);
	@@ -253,16 +253,16 @@
253
254	/*
255	** This routine is called when the outbound message is complete and
256	** it is time to being receiving a reply.
257	*/
258	void transport_flip(UrlData *pUrlData){
259	if( pUrlData->isFile ){
260	char *zCmd;
261	fclose(transport.pFile);
262	zCmd = mprintf("\"%s\" http \"%s\" \"%s\" \"%s\" 127.0.0.1 --localauth",
263	g.nameOfExe, pUrlData->name, transport.zOutFile, transport.zInFile
264	);
265	fossil_system(zCmd);
266	free(zCmd);
267	transport.pFile = fossil_fopen(transport.zInFile, "rb");
268	}
	@@ -282,21 +282,21 @@
282
283	/*
284	** This routine is called when the inbound message has been received
285	** and it is time to start sending again.
286	*/
287	void transport_rewind(UrlData *pUrlData){
288	if( pUrlData->isFile ){
289	transport_close(pUrlData);
290	}
291	}
292
293	/*
294	** Read N bytes of content directly from the wire and write into
295	** the buffer.
296	*/
297	static int transport_fetch(UrlData pUrlData, char zBuf, int N){
298	int got;
299	if( sshIn ){
300	int x;
301	int wanted = N;
302	got = 0;
	@@ -304,17 +304,17 @@
304	x = read(sshIn, &zBuf[got], wanted);
305	if( x<=0 ) break;
306	got += x;
307	wanted -= x;
308	}
309	}else if( pUrlData->isHttps ){
310	#ifdef FOSSIL_ENABLE_SSL
311	got = ssl_receive(0, zBuf, N);
312	#else
313	got = 0;
314	#endif
315	}else if( pUrlData->isFile ){
316	got = fread(zBuf, 1, N, transport.pFile);
317	}else{
318	got = socket_receive(0, zBuf, N);
319	}
320	/* printf("received %d of %d bytes\n", got, N); fflush(stdout); */
	@@ -327,11 +327,11 @@
327
328	/*
329	** Read N bytes of content from the wire and store in the supplied buffer.
330	** Return the number of bytes actually received.
331	*/
332	int transport_receive(UrlData pUrlData, char zBuf, int N){
333	int onHand; /* Bytes current held in the transport buffer */
334	int nByte = 0; /* Bytes of content received */
335
336	onHand = transport.nUsed - transport.iCursor;
337	if( g.fSshTrace){
	@@ -351,11 +351,11 @@
351	N -= toMove;
352	zBuf += toMove;
353	nByte += toMove;
354	}
355	if( N>0 ){
356	int got = transport_fetch(pUrlData, zBuf, N);
357	if( got>0 ){
358	nByte += got;
359	transport.nRcvd += got;
360	}
361	}
	@@ -366,11 +366,11 @@
366	/*
367	** Load up to N new bytes of content into the transport.pBuf buffer.
368	** The buffer itself might be moved. And the transport.iCursor value
369	** might be reset to 0.
370	*/
371	static void transport_load_buffer(UrlData *pUrlData, int N){
372	int i, j;
373	if( transport.nAlloc==0 ){
374	transport.nAlloc = N;
375	transport.pBuf = fossil_malloc( N );
376	transport.iCursor = 0;
	@@ -388,11 +388,11 @@
388	transport.nAlloc = transport.nUsed + N;
389	pNew = fossil_realloc(transport.pBuf, transport.nAlloc);
390	transport.pBuf = pNew;
391	}
392	if( N>0 ){
393	i = transport_fetch(pUrlData, &transport.pBuf[transport.nUsed], N);
394	if( i>0 ){
395	transport.nRcvd += i;
396	transport.nUsed += i;
397	}
398	}
	@@ -404,18 +404,18 @@
404	** from the received line and zero-terminate the result. Return a pointer
405	** to the line.
406	**
407	** Each call to this routine potentially overwrites the returned buffer.
408	*/
409	char transport_receive_line(UrlData pUrlData){
410	int i;
411	int iStart;
412
413	i = iStart = transport.iCursor;
414	while(1){
415	if( i >= transport.nUsed ){
416	transport_load_buffer(pUrlData, pUrlData->isSsh ? 2 : 1000);
417	i -= iStart;
418	iStart = 0;
419	if( i >= transport.nUsed ){
420	transport.pBuf[i] = 0;
421	transport.iCursor = i;
	@@ -437,15 +437,15 @@
437	}
438
439	/*
440	** Global transport shutdown
441	*/
442	void transport_global_shutdown(UrlData *pUrlData){
443	if( pUrlData->isSsh ){
444	transport_ssh_close();
445	}
446	if( pUrlData->isHttps ){
447	#ifdef FOSSIL_ENABLE_SSL
448	ssl_global_shutdown();
449	#endif
450	}else{
451	socket_global_shutdown();
452

M src/main.c

		--- src/main.c
		+++ src/main.c
		@@ -114,10 +114,12 @@
114	114	#endif
115	115
116	116	/*
117	117	** All global variables are in this structure.
118	118	*/
	119	+#define GLOBAL_URL() ((UrlData *)(&g.urlIsFile))
	120	+
119	121	struct Global {
120	122	int argc; char *argv; / Command-line arguments to the program */
121	123	char nameOfExe; / Full path of executable. */
122	124	const char zErrlog; / Log errors to this file, if not NULL */
123	125	int isConst; /* True if the output is unchanging */
		@@ -167,10 +169,14 @@
167	169	int wikiFlags; /* Wiki conversion flags applied to %w and %W */
168	170	char isHTTP; /* True if server/CGI modes, else assume CLI. */
169	171	char javascriptHyperlink; /* If true, set href= using script, not HTML */
170	172	Blob httpHeader; /* Complete text of the HTTP request header */
171	173
	174	+ /*
	175	+ ** NOTE: These members MUST be kept in sync with those in the "UrlData"
	176	+ ** structure defined in "url.c".
	177	+ */
172	178	int urlIsFile; /* True if a "file:" url */
173	179	int urlIsHttps; /* True if a "https:" url */
174	180	int urlIsSsh; /* True if an "ssh:" url */
175	181	char urlName; / Hostname for http: or filename for file: */
176	182	char urlHostname; / The HOST: parameter on http headers */
177	183

	--- src/main.c
	+++ src/main.c
	@@ -114,10 +114,12 @@
114	#endif
115
116	/*
117	** All global variables are in this structure.
118	*/


119	struct Global {
120	int argc; char *argv; / Command-line arguments to the program */
121	char nameOfExe; / Full path of executable. */
122	const char zErrlog; / Log errors to this file, if not NULL */
123	int isConst; /* True if the output is unchanging */
	@@ -167,10 +169,14 @@
167	int wikiFlags; /* Wiki conversion flags applied to %w and %W */
168	char isHTTP; /* True if server/CGI modes, else assume CLI. */
169	char javascriptHyperlink; /* If true, set href= using script, not HTML */
170	Blob httpHeader; /* Complete text of the HTTP request header */
171




172	int urlIsFile; /* True if a "file:" url */
173	int urlIsHttps; /* True if a "https:" url */
174	int urlIsSsh; /* True if an "ssh:" url */
175	char urlName; / Hostname for http: or filename for file: */
176	char urlHostname; / The HOST: parameter on http headers */
177

	--- src/main.c
	+++ src/main.c
	@@ -114,10 +114,12 @@
114	#endif
115
116	/*
117	** All global variables are in this structure.
118	*/
119	#define GLOBAL_URL() ((UrlData *)(&g.urlIsFile))
120
121	struct Global {
122	int argc; char *argv; / Command-line arguments to the program */
123	char nameOfExe; / Full path of executable. */
124	const char zErrlog; / Log errors to this file, if not NULL */
125	int isConst; /* True if the output is unchanging */
	@@ -167,10 +169,14 @@
169	int wikiFlags; /* Wiki conversion flags applied to %w and %W */
170	char isHTTP; /* True if server/CGI modes, else assume CLI. */
171	char javascriptHyperlink; /* If true, set href= using script, not HTML */
172	Blob httpHeader; /* Complete text of the HTTP request header */
173
174	/*
175	** NOTE: These members MUST be kept in sync with those in the "UrlData"
176	** structure defined in "url.c".
177	*/
178	int urlIsFile; /* True if a "file:" url */
179	int urlIsHttps; /* True if a "https:" url */
180	int urlIsSsh; /* True if an "ssh:" url */
181	char urlName; / Hostname for http: or filename for file: */
182	char urlHostname; / The HOST: parameter on http headers */
183

M src/th_main.c

+16 -16

		--- src/th_main.c
		+++ src/th_main.c
		@@ -847,10 +847,11 @@
847	847	int *argl
848	848	){
849	849	const char zSep, zType, zRegexp, zParams;
850	850	Blob header, payload;
851	851	ReCompiled *pRe = 0;
	852	+ UrlData urlData;
852	853
853	854	if( argc>1 && fossil_strnicmp(argv[1], "-asynchronous\0", 14) ){
854	855	Th_ErrorMessage(interp,
855	856	"synchronous http requests not yet implemented", 0, 0);
856	857	return TH_ERROR;
		@@ -865,12 +866,12 @@
865	866	zType = "POST";
866	867	}else{
867	868	zType = "GET";
868	869	}
869	870	zParams = strrchr(argv[1], '?');
870		- url_parse(argv[1], 0);
871		- if( g.urlIsSsh \|\| g.urlIsFile ){
	871	+ url_parse_local(argv[1], 0, &urlData);
	872	+ if( urlData.isSsh \|\| urlData.isFile ){
872	873	Th_ErrorMessage(interp, "url must be http:// or https://", 0, 0);
873	874	return TH_ERROR;
874	875	}
875	876	zRegexp = db_get("th1-uri-regexp", 0);
876	877	if( zRegexp && zRegexp[0] ){
		@@ -878,47 +879,46 @@
878	879	if( zErr ){
879	880	Th_SetResult(interp, zErr, -1);
880	881	return TH_ERROR;
881	882	}
882	883	}
883		- if( !re_match(pRe, (const unsigned char *)g.urlCanonical, -1) ){
	884	+ if( !re_match(pRe, (const unsigned char *)urlData.canonical, -1) ){
884	885	Th_SetResult(interp, "url not allowed", -1);
885	886	re_free(pRe);
886	887	return TH_ERROR;
887	888	}
888	889	re_free(pRe);
889		- if( transport_open() ){
890		- Th_ErrorMessage(interp, transport_errmsg(), 0, 0);
	890	+ if( transport_open(&urlData) ){
	891	+ Th_ErrorMessage(interp, transport_errmsg(&urlData), 0, 0);
891	892	return TH_ERROR;
892	893	}
893	894	blob_zero(&header);
894		- if( strlen(g.urlPath)>0 && zParams!=argv[1] ){
	895	+ if( strlen(urlData.path)>0 && zParams!=argv[1] ){
895	896	zSep = "";
896	897	}else{
897	898	zSep = "/";
898	899	}
899	900	blob_appendf(&header, "%s %s%s%s HTTP/1.0\r\n",
900		- zType, zSep, g.urlPath, zParams ? zParams : "");
901		- if( g.urlProxyAuth ){
902		- blob_appendf(&header, "Proxy-Authorization: %s\r\n", g.urlProxyAuth);
	901	+ zType, zSep, urlData.path, zParams ? zParams : "");
	902	+ if( urlData.proxyAuth ){
	903	+ blob_appendf(&header, "Proxy-Authorization: %s\r\n", urlData.proxyAuth);
903	904	}
904		- if( g.urlPasswd && g.urlUser && g.urlPasswd[0]=='#' ){
905		- char *zCredentials = mprintf("%s:%s", g.urlUser, &g.urlPasswd[1]);
	905	+ if( urlData.passwd && urlData.user && urlData.passwd[0]=='#' ){
	906	+ char *zCredentials = mprintf("%s:%s", urlData.user, &urlData.passwd[1]);
906	907	char *zEncoded = encode64(zCredentials, -1);
907	908	blob_appendf(&header, "Authorization: Basic %s\r\n", zEncoded);
908	909	fossil_free(zEncoded);
909	910	fossil_free(zCredentials);
910	911	}
911		- blob_appendf(&header, "Host: %s\r\n", g.urlHostname);
	912	+ blob_appendf(&header, "Host: %s\r\n", urlData.hostname);
912	913	blob_appendf(&header, "User-Agent: Fossil/" RELEASE_VERSION
913	914	" (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
914	915	blob_appendf(&header, "Content-Type: text/plain\r\n");
915	916	blob_appendf(&header, "Content-Length: %d\r\n\r\n", blob_size(&payload));
916		- transport_send(&header);
917		- transport_send(&payload);
918		- transport_close();
919		- g.urlProtocol = 0; /* Make sure the parsed URL is not reused. */
	917	+ transport_send(&urlData, &header);
	918	+ transport_send(&urlData, &payload);
	919	+ transport_close(&urlData);
920	920	Th_SetResult(interp, 0, 0); /* NOTE: Asynchronous, no results yet. */
921	921	return TH_OK;
922	922	}
923	923
924	924	/*
925	925

	--- src/th_main.c
	+++ src/th_main.c
	@@ -847,10 +847,11 @@
847	int *argl
848	){
849	const char zSep, zType, zRegexp, zParams;
850	Blob header, payload;
851	ReCompiled *pRe = 0;

852
853	if( argc>1 && fossil_strnicmp(argv[1], "-asynchronous\0", 14) ){
854	Th_ErrorMessage(interp,
855	"synchronous http requests not yet implemented", 0, 0);
856	return TH_ERROR;
	@@ -865,12 +866,12 @@
865	zType = "POST";
866	}else{
867	zType = "GET";
868	}
869	zParams = strrchr(argv[1], '?');
870	url_parse(argv[1], 0);
871	if( g.urlIsSsh \|\| g.urlIsFile ){
872	Th_ErrorMessage(interp, "url must be http:// or https://", 0, 0);
873	return TH_ERROR;
874	}
875	zRegexp = db_get("th1-uri-regexp", 0);
876	if( zRegexp && zRegexp[0] ){
	@@ -878,47 +879,46 @@
878	if( zErr ){
879	Th_SetResult(interp, zErr, -1);
880	return TH_ERROR;
881	}
882	}
883	if( !re_match(pRe, (const unsigned char *)g.urlCanonical, -1) ){
884	Th_SetResult(interp, "url not allowed", -1);
885	re_free(pRe);
886	return TH_ERROR;
887	}
888	re_free(pRe);
889	if( transport_open() ){
890	Th_ErrorMessage(interp, transport_errmsg(), 0, 0);
891	return TH_ERROR;
892	}
893	blob_zero(&header);
894	if( strlen(g.urlPath)>0 && zParams!=argv[1] ){
895	zSep = "";
896	}else{
897	zSep = "/";
898	}
899	blob_appendf(&header, "%s %s%s%s HTTP/1.0\r\n",
900	zType, zSep, g.urlPath, zParams ? zParams : "");
901	if( g.urlProxyAuth ){
902	blob_appendf(&header, "Proxy-Authorization: %s\r\n", g.urlProxyAuth);
903	}
904	if( g.urlPasswd && g.urlUser && g.urlPasswd[0]=='#' ){
905	char *zCredentials = mprintf("%s:%s", g.urlUser, &g.urlPasswd[1]);
906	char *zEncoded = encode64(zCredentials, -1);
907	blob_appendf(&header, "Authorization: Basic %s\r\n", zEncoded);
908	fossil_free(zEncoded);
909	fossil_free(zCredentials);
910	}
911	blob_appendf(&header, "Host: %s\r\n", g.urlHostname);
912	blob_appendf(&header, "User-Agent: Fossil/" RELEASE_VERSION
913	" (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
914	blob_appendf(&header, "Content-Type: text/plain\r\n");
915	blob_appendf(&header, "Content-Length: %d\r\n\r\n", blob_size(&payload));
916	transport_send(&header);
917	transport_send(&payload);
918	transport_close();
919	g.urlProtocol = 0; /* Make sure the parsed URL is not reused. */
920	Th_SetResult(interp, 0, 0); /* NOTE: Asynchronous, no results yet. */
921	return TH_OK;
922	}
923
924	/*
925

	--- src/th_main.c
	+++ src/th_main.c
	@@ -847,10 +847,11 @@
847	int *argl
848	){
849	const char zSep, zType, zRegexp, zParams;
850	Blob header, payload;
851	ReCompiled *pRe = 0;
852	UrlData urlData;
853
854	if( argc>1 && fossil_strnicmp(argv[1], "-asynchronous\0", 14) ){
855	Th_ErrorMessage(interp,
856	"synchronous http requests not yet implemented", 0, 0);
857	return TH_ERROR;
	@@ -865,12 +866,12 @@
866	zType = "POST";
867	}else{
868	zType = "GET";
869	}
870	zParams = strrchr(argv[1], '?');
871	url_parse_local(argv[1], 0, &urlData);
872	if( urlData.isSsh \|\| urlData.isFile ){
873	Th_ErrorMessage(interp, "url must be http:// or https://", 0, 0);
874	return TH_ERROR;
875	}
876	zRegexp = db_get("th1-uri-regexp", 0);
877	if( zRegexp && zRegexp[0] ){
	@@ -878,47 +879,46 @@
879	if( zErr ){
880	Th_SetResult(interp, zErr, -1);
881	return TH_ERROR;
882	}
883	}
884	if( !re_match(pRe, (const unsigned char *)urlData.canonical, -1) ){
885	Th_SetResult(interp, "url not allowed", -1);
886	re_free(pRe);
887	return TH_ERROR;
888	}
889	re_free(pRe);
890	if( transport_open(&urlData) ){
891	Th_ErrorMessage(interp, transport_errmsg(&urlData), 0, 0);
892	return TH_ERROR;
893	}
894	blob_zero(&header);
895	if( strlen(urlData.path)>0 && zParams!=argv[1] ){
896	zSep = "";
897	}else{
898	zSep = "/";
899	}
900	blob_appendf(&header, "%s %s%s%s HTTP/1.0\r\n",
901	zType, zSep, urlData.path, zParams ? zParams : "");
902	if( urlData.proxyAuth ){
903	blob_appendf(&header, "Proxy-Authorization: %s\r\n", urlData.proxyAuth);
904	}
905	if( urlData.passwd && urlData.user && urlData.passwd[0]=='#' ){
906	char *zCredentials = mprintf("%s:%s", urlData.user, &urlData.passwd[1]);
907	char *zEncoded = encode64(zCredentials, -1);
908	blob_appendf(&header, "Authorization: Basic %s\r\n", zEncoded);
909	fossil_free(zEncoded);
910	fossil_free(zCredentials);
911	}
912	blob_appendf(&header, "Host: %s\r\n", urlData.hostname);
913	blob_appendf(&header, "User-Agent: Fossil/" RELEASE_VERSION
914	" (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
915	blob_appendf(&header, "Content-Type: text/plain\r\n");
916	blob_appendf(&header, "Content-Length: %d\r\n\r\n", blob_size(&payload));
917	transport_send(&urlData, &header);
918	transport_send(&urlData, &payload);
919	transport_close(&urlData);

920	Th_SetResult(interp, 0, 0); /* NOTE: Asynchronous, no results yet. */
921	return TH_OK;
922	}
923
924	/*
925

M src/url.c

+247 -179

		--- src/url.c
		+++ src/url.c
		@@ -28,10 +28,34 @@
28	28	#define URL_REMEMBER 0x002 /* Remember the url for later reuse */
29	29	#define URL_ASK_REMEMBER_PW 0x004 /* Ask whether to remember prompted pw */
30	30	#define URL_REMEMBER_PW 0x008 /* Should remember pw */
31	31	#define URL_PROMPTED 0x010 /* Prompted for PW already */
32	32
	33	+/*
	34	+** The URL related data used with this subsystem.
	35	+*/
	36	+struct UrlData {
	37	+ /*
	38	+ ** NOTE: These members MUST be kept in sync with the related ones in the
	39	+ ** "Global" structure defined in "main.c".
	40	+ */
	41	+ int isFile; /* True if a "file:" url */
	42	+ int isHttps; /* True if a "https:" url */
	43	+ int isSsh; /* True if an "ssh:" url */
	44	+ char name; / Hostname for http: or filename for file: */
	45	+ char hostname; / The HOST: parameter on http headers */
	46	+ char protocol; / "http" or "https" */
	47	+ int port; /* TCP port number for http: or https: */
	48	+ int dfltPort; /* The default port for the given protocol */
	49	+ char path; / Pathname for http: */
	50	+ char user; / User id for http: */
	51	+ char passwd; / Password for http: */
	52	+ char canonical; / Canonical representation of the URL */
	53	+ char proxyAuth; / Proxy-Authorizer: string */
	54	+ char fossil; / The fossil query parameter on ssh: */
	55	+ unsigned flags; /* Boolean flags controlling URL processing */
	56	+};
33	57	#endif /* INTERFACE */
34	58
35	59
36	60	/*
37	61	** Convert a string to lower-case.
		@@ -40,10 +64,203 @@
40	64	while( *z ){
41	65	z = fossil_tolower(z);
42	66	z++;
43	67	}
44	68	}
	69	+
	70	+/*
	71	+** Parse the given URL. Populate members of the provided UrlData structure
	72	+** as follows:
	73	+**
	74	+** isFile True if FILE:
	75	+** isHttps True if HTTPS:
	76	+** isSsh True if SSH:
	77	+** protocol "http" or "https" or "file"
	78	+** name Hostname for HTTP:, HTTPS:, SSH:. Filename for FILE:
	79	+** port TCP port number for HTTP or HTTPS.
	80	+** dfltPort Default TCP port number (80 or 443).
	81	+** path Path name for HTTP or HTTPS.
	82	+** user Userid.
	83	+** passwd Password.
	84	+** hostname HOST:PORT or just HOST if port is the default.
	85	+** canonical The URL in canonical form, omitting the password
	86	+**
	87	+*/
	88	+void url_parse_local(
	89	+ const char *zUrl,
	90	+ unsigned int urlFlags,
	91	+ UrlData *pUrlData
	92	+){
	93	+ int i, j, c;
	94	+ char *zFile = 0;
	95	+ int bPrompted = 0;
	96	+ int bSetUrl = 1;
	97	+
	98	+ memset(pUrlData, 0, sizeof(UrlData));
	99	+
	100	+ if( zUrl==0 ){
	101	+ zUrl = db_get("last-sync-url", 0);
	102	+ if( zUrl==0 ) return;
	103	+ pUrlData->passwd = unobscure(db_get("last-sync-pw", 0));
	104	+ bSetUrl = 0;
	105	+ }
	106	+
	107	+ if( strncmp(zUrl, "http://", 7)==0
	108	+ \|\| strncmp(zUrl, "https://", 8)==0
	109	+ \|\| strncmp(zUrl, "ssh://", 6)==0
	110	+ ){
	111	+ int iStart;
	112	+ char *zLogin;
	113	+ char *zExe;
	114	+ char cQuerySep = '?';
	115	+
	116	+ pUrlData->isFile = 0;
	117	+ if( zUrl[4]=='s' ){
	118	+ pUrlData->isHttps = 1;
	119	+ pUrlData->protocol = "https";
	120	+ pUrlData->dfltPort = 443;
	121	+ iStart = 8;
	122	+ }else if( zUrl[0]=='s' ){
	123	+ pUrlData->isSsh = 1;
	124	+ pUrlData->protocol = "ssh";
	125	+ pUrlData->dfltPort = 22;
	126	+ pUrlData->fossil = "fossil";
	127	+ iStart = 6;
	128	+ }else{
	129	+ pUrlData->isHttps = 0;
	130	+ pUrlData->protocol = "http";
	131	+ pUrlData->dfltPort = 80;
	132	+ iStart = 7;
	133	+ }
	134	+ for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
	135	+ if( c=='@' ){
	136	+ /* Parse up the user-id and password */
	137	+ for(j=iStart; j<i && zUrl[j]!=':'; j++){}
	138	+ pUrlData->user = mprintf("%.*s", j-iStart, &zUrl[iStart]);
	139	+ dehttpize(pUrlData->user);
	140	+ if( j<i ){
	141	+ pUrlData->passwd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
	142	+ dehttpize(pUrlData->passwd);
	143	+ }
	144	+ if( pUrlData->isSsh && pUrlData->passwd ){
	145	+ zLogin = mprintf("%t:*@", pUrlData->user);
	146	+ }else{
	147	+ zLogin = mprintf("%t@", pUrlData->user);
	148	+ }
	149	+ for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
	150	+ pUrlData->name = mprintf("%.*s", j-i-1, &zUrl[i+1]);
	151	+ i = j;
	152	+ }else{
	153	+ for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
	154	+ pUrlData->name = mprintf("%.*s", i-iStart, &zUrl[iStart]);
	155	+ zLogin = mprintf("");
	156	+ }
	157	+ url_tolower(pUrlData->name);
	158	+ if( c==':' ){
	159	+ pUrlData->port = 0;
	160	+ i++;
	161	+ while( (c = zUrl[i])!=0 && fossil_isdigit(c) ){
	162	+ pUrlData->port = pUrlData->port*10 + c - '0';
	163	+ i++;
	164	+ }
	165	+ pUrlData->hostname = mprintf("%s:%d", pUrlData->name, pUrlData->port);
	166	+ }else{
	167	+ pUrlData->port = pUrlData->dfltPort;
	168	+ pUrlData->hostname = pUrlData->name;
	169	+ }
	170	+ dehttpize(pUrlData->name);
	171	+ pUrlData->path = mprintf("%s", &zUrl[i]);
	172	+ for(i=0; pUrlData->path[i] && pUrlData->path[i]!='?'; i++){}
	173	+ if( pUrlData->path[i] ){
	174	+ pUrlData->path[i] = 0;
	175	+ i++;
	176	+ }
	177	+ zExe = mprintf("");
	178	+ while( pUrlData->path[i]!=0 ){
	179	+ char zName, zValue;
	180	+ zName = &pUrlData->path[i];
	181	+ zValue = zName;
	182	+ while( pUrlData->path[i] && pUrlData->path[i]!='=' ){ i++; }
	183	+ if( pUrlData->path[i]=='=' ){
	184	+ pUrlData->path[i] = 0;
	185	+ i++;
	186	+ zValue = &pUrlData->path[i];
	187	+ while( pUrlData->path[i] && pUrlData->path[i]!='&' ){ i++; }
	188	+ }
	189	+ if( pUrlData->path[i] ){
	190	+ pUrlData->path[i] = 0;
	191	+ i++;
	192	+ }
	193	+ if( fossil_strcmp(zName,"fossil")==0 ){
	194	+ pUrlData->fossil = zValue;
	195	+ dehttpize(pUrlData->fossil);
	196	+ zExe = mprintf("%cfossil=%T", cQuerySep, pUrlData->fossil);
	197	+ cQuerySep = '&';
	198	+ }
	199	+ }
	200	+
	201	+ dehttpize(pUrlData->path);
	202	+ if( pUrlData->dfltPort==pUrlData->port ){
	203	+ pUrlData->canonical = mprintf(
	204	+ "%s://%s%T%T%s",
	205	+ pUrlData->protocol, zLogin, pUrlData->name, pUrlData->path, zExe
	206	+ );
	207	+ }else{
	208	+ pUrlData->canonical = mprintf(
	209	+ "%s://%s%T:%d%T%s",
	210	+ pUrlData->protocol, zLogin, pUrlData->name, pUrlData->port,
	211	+ pUrlData->path, zExe
	212	+ );
	213	+ }
	214	+ if( pUrlData->isSsh && pUrlData->path[1] ) pUrlData->path++;
	215	+ free(zLogin);
	216	+ }else if( strncmp(zUrl, "file:", 5)==0 ){
	217	+ pUrlData->isFile = 1;
	218	+ if( zUrl[5]=='/' && zUrl[6]=='/' ){
	219	+ i = 7;
	220	+ }else{
	221	+ i = 5;
	222	+ }
	223	+ zFile = mprintf("%s", &zUrl[i]);
	224	+ }else if( file_isfile(zUrl) ){
	225	+ pUrlData->isFile = 1;
	226	+ zFile = mprintf("%s", zUrl);
	227	+ }else if( file_isdir(zUrl)==1 ){
	228	+ zFile = mprintf("%s/FOSSIL", zUrl);
	229	+ if( file_isfile(zFile) ){
	230	+ pUrlData->isFile = 1;
	231	+ }else{
	232	+ free(zFile);
	233	+ fossil_fatal("unknown repository: %s", zUrl);
	234	+ }
	235	+ }else{
	236	+ fossil_fatal("unknown repository: %s", zUrl);
	237	+ }
	238	+ pUrlData->flags = urlFlags;
	239	+ if( pUrlData->isFile ){
	240	+ Blob cfile;
	241	+ dehttpize(zFile);
	242	+ file_canonical_name(zFile, &cfile, 0);
	243	+ free(zFile);
	244	+ pUrlData->protocol = "file";
	245	+ pUrlData->path = "";
	246	+ pUrlData->name = mprintf("%b", &cfile);
	247	+ pUrlData->canonical = mprintf("file://%T", pUrlData->name);
	248	+ blob_reset(&cfile);
	249	+ }else if( pUrlData->user!=0 && pUrlData->passwd==0 && (urlFlags & URL_PROMPT_PW) ){
	250	+ url_prompt_for_password();
	251	+ bPrompted = 1;
	252	+ }
	253	+ if( urlFlags & URL_REMEMBER ){
	254	+ if( bSetUrl ){
	255	+ db_set("last-sync-url", pUrlData->canonical, 0);
	256	+ }
	257	+ if( !bPrompted && pUrlData->passwd && pUrlData->user ){
	258	+ db_set("last-sync-pw", obscure(pUrlData->passwd), 0);
	259	+ }
	260	+ }
	261	+}
45	262
46	263	/*
47	264	** Parse the given URL, which describes a sync server. Populate variables
48	265	** in the global "g" structure as follows:
49	266	**
		@@ -68,175 +285,14 @@
68	285	**
69	286	** ssh://userid:password@host:port/path?fossil=path/to/fossil.exe
70	287	**
71	288	*/
72	289	void url_parse(const char *zUrl, unsigned int urlFlags){
73		- int i, j, c;
74		- char *zFile = 0;
75		- int bPrompted = 0;
76		- int bSetUrl = 1;
77		-
78		- if( zUrl==0 ){
79		- zUrl = db_get("last-sync-url", 0);
80		- if( zUrl==0 ) return;
81		- g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
82		- bSetUrl = 0;
83		- }
84		-
85		- if( strncmp(zUrl, "http://", 7)==0
86		- \|\| strncmp(zUrl, "https://", 8)==0
87		- \|\| strncmp(zUrl, "ssh://", 6)==0
88		- ){
89		- int iStart;
90		- char *zLogin;
91		- char *zExe;
92		- char cQuerySep = '?';
93		-
94		- g.urlIsFile = 0;
95		- if( zUrl[4]=='s' ){
96		- g.urlIsHttps = 1;
97		- g.urlProtocol = "https";
98		- g.urlDfltPort = 443;
99		- iStart = 8;
100		- }else if( zUrl[0]=='s' ){
101		- g.urlIsSsh = 1;
102		- g.urlProtocol = "ssh";
103		- g.urlDfltPort = 22;
104		- g.urlFossil = "fossil";
105		- iStart = 6;
106		- }else{
107		- g.urlIsHttps = 0;
108		- g.urlProtocol = "http";
109		- g.urlDfltPort = 80;
110		- iStart = 7;
111		- }
112		- for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
113		- if( c=='@' ){
114		- /* Parse up the user-id and password */
115		- for(j=iStart; j<i && zUrl[j]!=':'; j++){}
116		- g.urlUser = mprintf("%.*s", j-iStart, &zUrl[iStart]);
117		- dehttpize(g.urlUser);
118		- if( j<i ){
119		- g.urlPasswd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
120		- dehttpize(g.urlPasswd);
121		- }
122		- if( g.urlIsSsh && g.urlPasswd ){
123		- zLogin = mprintf("%t:*@", g.urlUser);
124		- }else{
125		- zLogin = mprintf("%t@", g.urlUser);
126		- }
127		- for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
128		- g.urlName = mprintf("%.*s", j-i-1, &zUrl[i+1]);
129		- i = j;
130		- }else{
131		- for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
132		- g.urlName = mprintf("%.*s", i-iStart, &zUrl[iStart]);
133		- zLogin = mprintf("");
134		- }
135		- url_tolower(g.urlName);
136		- if( c==':' ){
137		- g.urlPort = 0;
138		- i++;
139		- while( (c = zUrl[i])!=0 && fossil_isdigit(c) ){
140		- g.urlPort = g.urlPort*10 + c - '0';
141		- i++;
142		- }
143		- g.urlHostname = mprintf("%s:%d", g.urlName, g.urlPort);
144		- }else{
145		- g.urlPort = g.urlDfltPort;
146		- g.urlHostname = g.urlName;
147		- }
148		- dehttpize(g.urlName);
149		- g.urlPath = mprintf("%s", &zUrl[i]);
150		- for(i=0; g.urlPath[i] && g.urlPath[i]!='?'; i++){}
151		- if( g.urlPath[i] ){
152		- g.urlPath[i] = 0;
153		- i++;
154		- }
155		- zExe = mprintf("");
156		- while( g.urlPath[i]!=0 ){
157		- char zName, zValue;
158		- zName = &g.urlPath[i];
159		- zValue = zName;
160		- while( g.urlPath[i] && g.urlPath[i]!='=' ){ i++; }
161		- if( g.urlPath[i]=='=' ){
162		- g.urlPath[i] = 0;
163		- i++;
164		- zValue = &g.urlPath[i];
165		- while( g.urlPath[i] && g.urlPath[i]!='&' ){ i++; }
166		- }
167		- if( g.urlPath[i] ){
168		- g.urlPath[i] = 0;
169		- i++;
170		- }
171		- if( fossil_strcmp(zName,"fossil")==0 ){
172		- g.urlFossil = zValue;
173		- dehttpize(g.urlFossil);
174		- zExe = mprintf("%cfossil=%T", cQuerySep, g.urlFossil);
175		- cQuerySep = '&';
176		- }
177		- }
178		-
179		- dehttpize(g.urlPath);
180		- if( g.urlDfltPort==g.urlPort ){
181		- g.urlCanonical = mprintf(
182		- "%s://%s%T%T%s",
183		- g.urlProtocol, zLogin, g.urlName, g.urlPath, zExe
184		- );
185		- }else{
186		- g.urlCanonical = mprintf(
187		- "%s://%s%T:%d%T%s",
188		- g.urlProtocol, zLogin, g.urlName, g.urlPort, g.urlPath, zExe
189		- );
190		- }
191		- if( g.urlIsSsh && g.urlPath[1] ) g.urlPath++;
192		- free(zLogin);
193		- }else if( strncmp(zUrl, "file:", 5)==0 ){
194		- g.urlIsFile = 1;
195		- if( zUrl[5]=='/' && zUrl[6]=='/' ){
196		- i = 7;
197		- }else{
198		- i = 5;
199		- }
200		- zFile = mprintf("%s", &zUrl[i]);
201		- }else if( file_isfile(zUrl) ){
202		- g.urlIsFile = 1;
203		- zFile = mprintf("%s", zUrl);
204		- }else if( file_isdir(zUrl)==1 ){
205		- zFile = mprintf("%s/FOSSIL", zUrl);
206		- if( file_isfile(zFile) ){
207		- g.urlIsFile = 1;
208		- }else{
209		- free(zFile);
210		- fossil_fatal("unknown repository: %s", zUrl);
211		- }
212		- }else{
213		- fossil_fatal("unknown repository: %s", zUrl);
214		- }
215		- g.urlFlags = urlFlags;
216		- if( g.urlIsFile ){
217		- Blob cfile;
218		- dehttpize(zFile);
219		- file_canonical_name(zFile, &cfile, 0);
220		- free(zFile);
221		- g.urlProtocol = "file";
222		- g.urlPath = "";
223		- g.urlName = mprintf("%b", &cfile);
224		- g.urlCanonical = mprintf("file://%T", g.urlName);
225		- blob_reset(&cfile);
226		- }else if( g.urlUser!=0 && g.urlPasswd==0 && (urlFlags & URL_PROMPT_PW) ){
227		- url_prompt_for_password();
228		- bPrompted = 1;
229		- }
230		- if( urlFlags & URL_REMEMBER ){
231		- if( bSetUrl ){
232		- db_set("last-sync-url", g.urlCanonical, 0);
233		- }
234		- if( !bPrompted && g.urlPasswd && g.urlUser ){
235		- db_set("last-sync-pw", obscure(g.urlPasswd), 0);
236		- }
237		- }
	290	+ UrlData urlData;
	291	+ memcpy(&urlData, GLOBAL_URL(), sizeof(UrlData));
	292	+ url_parse_local(zUrl, urlFlags, &urlData);
	293	+ memcpy(GLOBAL_URL(), &urlData, sizeof(UrlData));
238	294	}
239	295
240	296	/*
241	297	** COMMAND: test-urlparser
242	298	**
		@@ -428,36 +484,48 @@
428	484	}
429	485	return blob_str(&p->url);
430	486	}
431	487
432	488	/*
433		-** Prompt the user for the password for g.urlUser. Store the result
434		-** in g.urlPasswd.
	489	+** Prompt the user for the password that corresponds to the "user" member of
	490	+** the provided UrlData structure. Store the result into the "passwd" member
	491	+** of the provided UrlData structure.
435	492	*/
436		-void url_prompt_for_password(void){
437		- if( g.urlIsSsh \|\| g.urlIsFile ) return;
	493	+void url_prompt_for_password_local(UrlData *pUrlData){
	494	+ if( pUrlData->isSsh \|\| pUrlData->isFile ) return;
438	495	if( isatty(fileno(stdin))
439		- && (g.urlFlags & URL_PROMPT_PW)!=0
440		- && (g.urlFlags & URL_PROMPTED)==0
	496	+ && (pUrlData->flags & URL_PROMPT_PW)!=0
	497	+ && (pUrlData->flags & URL_PROMPTED)==0
441	498	){
442		- g.urlFlags \|= URL_PROMPTED;
443		- g.urlPasswd = prompt_for_user_password(g.urlUser);
444		- if( g.urlPasswd[0]
445		- && (g.urlFlags & (URL_REMEMBER\|URL_ASK_REMEMBER_PW))!=0
	499	+ pUrlData->flags \|= URL_PROMPTED;
	500	+ pUrlData->passwd = prompt_for_user_password(pUrlData->user);
	501	+ if( pUrlData->passwd[0]
	502	+ && (pUrlData->flags & (URL_REMEMBER\|URL_ASK_REMEMBER_PW))!=0
446	503	){
447	504	if( save_password_prompt() ){
448		- g.urlFlags \|= URL_REMEMBER_PW;
449		- if( g.urlFlags & URL_REMEMBER ){
450		- db_set("last-sync-pw", obscure(g.urlPasswd), 0);
	505	+ pUrlData->flags \|= URL_REMEMBER_PW;
	506	+ if( pUrlData->flags & URL_REMEMBER ){
	507	+ db_set("last-sync-pw", obscure(pUrlData->passwd), 0);
451	508	}
452	509	}
453	510	}
454	511	}else{
455	512	fossil_fatal("missing or incorrect password for user \"%s\"",
456		- g.urlUser);
	513	+ pUrlData->user);
457	514	}
458	515	}
	516	+
	517	+/*
	518	+** Prompt the user for the password for g.urlUser. Store the result
	519	+** in g.urlPasswd.
	520	+*/
	521	+void url_prompt_for_password(void){
	522	+ UrlData urlData;
	523	+ memcpy(&urlData, GLOBAL_URL(), sizeof(UrlData));
	524	+ url_prompt_for_password_local(&urlData);
	525	+ memcpy(GLOBAL_URL(), &urlData, sizeof(UrlData));
	526	+}
459	527
460	528	/*
461	529	** Remember the URL if requested.
462	530	*/
463	531	void url_remember(void){
464	532

	--- src/url.c
	+++ src/url.c
	@@ -28,10 +28,34 @@
28	#define URL_REMEMBER 0x002 /* Remember the url for later reuse */
29	#define URL_ASK_REMEMBER_PW 0x004 /* Ask whether to remember prompted pw */
30	#define URL_REMEMBER_PW 0x008 /* Should remember pw */
31	#define URL_PROMPTED 0x010 /* Prompted for PW already */
32
























33	#endif /* INTERFACE */
34
35
36	/*
37	** Convert a string to lower-case.
	@@ -40,10 +64,203 @@
40	while( *z ){
41	z = fossil_tolower(z);
42	z++;
43	}
44	}

































































































































































































45
46	/*
47	** Parse the given URL, which describes a sync server. Populate variables
48	** in the global "g" structure as follows:
49	**
	@@ -68,175 +285,14 @@
68	**
69	** ssh://userid:password@host:port/path?fossil=path/to/fossil.exe
70	**
71	*/
72	void url_parse(const char *zUrl, unsigned int urlFlags){
73	int i, j, c;
74	char *zFile = 0;
75	int bPrompted = 0;
76	int bSetUrl = 1;
77
78	if( zUrl==0 ){
79	zUrl = db_get("last-sync-url", 0);
80	if( zUrl==0 ) return;
81	g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
82	bSetUrl = 0;
83	}
84
85	if( strncmp(zUrl, "http://", 7)==0
86	\|\| strncmp(zUrl, "https://", 8)==0
87	\|\| strncmp(zUrl, "ssh://", 6)==0
88	){
89	int iStart;
90	char *zLogin;
91	char *zExe;
92	char cQuerySep = '?';
93
94	g.urlIsFile = 0;
95	if( zUrl[4]=='s' ){
96	g.urlIsHttps = 1;
97	g.urlProtocol = "https";
98	g.urlDfltPort = 443;
99	iStart = 8;
100	}else if( zUrl[0]=='s' ){
101	g.urlIsSsh = 1;
102	g.urlProtocol = "ssh";
103	g.urlDfltPort = 22;
104	g.urlFossil = "fossil";
105	iStart = 6;
106	}else{
107	g.urlIsHttps = 0;
108	g.urlProtocol = "http";
109	g.urlDfltPort = 80;
110	iStart = 7;
111	}
112	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
113	if( c=='@' ){
114	/* Parse up the user-id and password */
115	for(j=iStart; j<i && zUrl[j]!=':'; j++){}
116	g.urlUser = mprintf("%.*s", j-iStart, &zUrl[iStart]);
117	dehttpize(g.urlUser);
118	if( j<i ){
119	g.urlPasswd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
120	dehttpize(g.urlPasswd);
121	}
122	if( g.urlIsSsh && g.urlPasswd ){
123	zLogin = mprintf("%t:*@", g.urlUser);
124	}else{
125	zLogin = mprintf("%t@", g.urlUser);
126	}
127	for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
128	g.urlName = mprintf("%.*s", j-i-1, &zUrl[i+1]);
129	i = j;
130	}else{
131	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
132	g.urlName = mprintf("%.*s", i-iStart, &zUrl[iStart]);
133	zLogin = mprintf("");
134	}
135	url_tolower(g.urlName);
136	if( c==':' ){
137	g.urlPort = 0;
138	i++;
139	while( (c = zUrl[i])!=0 && fossil_isdigit(c) ){
140	g.urlPort = g.urlPort*10 + c - '0';
141	i++;
142	}
143	g.urlHostname = mprintf("%s:%d", g.urlName, g.urlPort);
144	}else{
145	g.urlPort = g.urlDfltPort;
146	g.urlHostname = g.urlName;
147	}
148	dehttpize(g.urlName);
149	g.urlPath = mprintf("%s", &zUrl[i]);
150	for(i=0; g.urlPath[i] && g.urlPath[i]!='?'; i++){}
151	if( g.urlPath[i] ){
152	g.urlPath[i] = 0;
153	i++;
154	}
155	zExe = mprintf("");
156	while( g.urlPath[i]!=0 ){
157	char zName, zValue;
158	zName = &g.urlPath[i];
159	zValue = zName;
160	while( g.urlPath[i] && g.urlPath[i]!='=' ){ i++; }
161	if( g.urlPath[i]=='=' ){
162	g.urlPath[i] = 0;
163	i++;
164	zValue = &g.urlPath[i];
165	while( g.urlPath[i] && g.urlPath[i]!='&' ){ i++; }
166	}
167	if( g.urlPath[i] ){
168	g.urlPath[i] = 0;
169	i++;
170	}
171	if( fossil_strcmp(zName,"fossil")==0 ){
172	g.urlFossil = zValue;
173	dehttpize(g.urlFossil);
174	zExe = mprintf("%cfossil=%T", cQuerySep, g.urlFossil);
175	cQuerySep = '&';
176	}
177	}
178
179	dehttpize(g.urlPath);
180	if( g.urlDfltPort==g.urlPort ){
181	g.urlCanonical = mprintf(
182	"%s://%s%T%T%s",
183	g.urlProtocol, zLogin, g.urlName, g.urlPath, zExe
184	);
185	}else{
186	g.urlCanonical = mprintf(
187	"%s://%s%T:%d%T%s",
188	g.urlProtocol, zLogin, g.urlName, g.urlPort, g.urlPath, zExe
189	);
190	}
191	if( g.urlIsSsh && g.urlPath[1] ) g.urlPath++;
192	free(zLogin);
193	}else if( strncmp(zUrl, "file:", 5)==0 ){
194	g.urlIsFile = 1;
195	if( zUrl[5]=='/' && zUrl[6]=='/' ){
196	i = 7;
197	}else{
198	i = 5;
199	}
200	zFile = mprintf("%s", &zUrl[i]);
201	}else if( file_isfile(zUrl) ){
202	g.urlIsFile = 1;
203	zFile = mprintf("%s", zUrl);
204	}else if( file_isdir(zUrl)==1 ){
205	zFile = mprintf("%s/FOSSIL", zUrl);
206	if( file_isfile(zFile) ){
207	g.urlIsFile = 1;
208	}else{
209	free(zFile);
210	fossil_fatal("unknown repository: %s", zUrl);
211	}
212	}else{
213	fossil_fatal("unknown repository: %s", zUrl);
214	}
215	g.urlFlags = urlFlags;
216	if( g.urlIsFile ){
217	Blob cfile;
218	dehttpize(zFile);
219	file_canonical_name(zFile, &cfile, 0);
220	free(zFile);
221	g.urlProtocol = "file";
222	g.urlPath = "";
223	g.urlName = mprintf("%b", &cfile);
224	g.urlCanonical = mprintf("file://%T", g.urlName);
225	blob_reset(&cfile);
226	}else if( g.urlUser!=0 && g.urlPasswd==0 && (urlFlags & URL_PROMPT_PW) ){
227	url_prompt_for_password();
228	bPrompted = 1;
229	}
230	if( urlFlags & URL_REMEMBER ){
231	if( bSetUrl ){
232	db_set("last-sync-url", g.urlCanonical, 0);
233	}
234	if( !bPrompted && g.urlPasswd && g.urlUser ){
235	db_set("last-sync-pw", obscure(g.urlPasswd), 0);
236	}
237	}
238	}
239
240	/*
241	** COMMAND: test-urlparser
242	**
	@@ -428,36 +484,48 @@
428	}
429	return blob_str(&p->url);
430	}
431
432	/*
433	** Prompt the user for the password for g.urlUser. Store the result
434	** in g.urlPasswd.

435	*/
436	void url_prompt_for_password(void){
437	if( g.urlIsSsh \|\| g.urlIsFile ) return;
438	if( isatty(fileno(stdin))
439	&& (g.urlFlags & URL_PROMPT_PW)!=0
440	&& (g.urlFlags & URL_PROMPTED)==0
441	){
442	g.urlFlags \|= URL_PROMPTED;
443	g.urlPasswd = prompt_for_user_password(g.urlUser);
444	if( g.urlPasswd[0]
445	&& (g.urlFlags & (URL_REMEMBER\|URL_ASK_REMEMBER_PW))!=0
446	){
447	if( save_password_prompt() ){
448	g.urlFlags \|= URL_REMEMBER_PW;
449	if( g.urlFlags & URL_REMEMBER ){
450	db_set("last-sync-pw", obscure(g.urlPasswd), 0);
451	}
452	}
453	}
454	}else{
455	fossil_fatal("missing or incorrect password for user \"%s\"",
456	g.urlUser);
457	}
458	}











459
460	/*
461	** Remember the URL if requested.
462	*/
463	void url_remember(void){
464

	--- src/url.c
	+++ src/url.c
	@@ -28,10 +28,34 @@
28	#define URL_REMEMBER 0x002 /* Remember the url for later reuse */
29	#define URL_ASK_REMEMBER_PW 0x004 /* Ask whether to remember prompted pw */
30	#define URL_REMEMBER_PW 0x008 /* Should remember pw */
31	#define URL_PROMPTED 0x010 /* Prompted for PW already */
32
33	/*
34	** The URL related data used with this subsystem.
35	*/
36	struct UrlData {
37	/*
38	** NOTE: These members MUST be kept in sync with the related ones in the
39	** "Global" structure defined in "main.c".
40	*/
41	int isFile; /* True if a "file:" url */
42	int isHttps; /* True if a "https:" url */
43	int isSsh; /* True if an "ssh:" url */
44	char name; / Hostname for http: or filename for file: */
45	char hostname; / The HOST: parameter on http headers */
46	char protocol; / "http" or "https" */
47	int port; /* TCP port number for http: or https: */
48	int dfltPort; /* The default port for the given protocol */
49	char path; / Pathname for http: */
50	char user; / User id for http: */
51	char passwd; / Password for http: */
52	char canonical; / Canonical representation of the URL */
53	char proxyAuth; / Proxy-Authorizer: string */
54	char fossil; / The fossil query parameter on ssh: */
55	unsigned flags; /* Boolean flags controlling URL processing */
56	};
57	#endif /* INTERFACE */
58
59
60	/*
61	** Convert a string to lower-case.
	@@ -40,10 +64,203 @@
64	while( *z ){
65	z = fossil_tolower(z);
66	z++;
67	}
68	}
69
70	/*
71	** Parse the given URL. Populate members of the provided UrlData structure
72	** as follows:
73	**
74	** isFile True if FILE:
75	** isHttps True if HTTPS:
76	** isSsh True if SSH:
77	** protocol "http" or "https" or "file"
78	** name Hostname for HTTP:, HTTPS:, SSH:. Filename for FILE:
79	** port TCP port number for HTTP or HTTPS.
80	** dfltPort Default TCP port number (80 or 443).
81	** path Path name for HTTP or HTTPS.
82	** user Userid.
83	** passwd Password.
84	** hostname HOST:PORT or just HOST if port is the default.
85	** canonical The URL in canonical form, omitting the password
86	**
87	*/
88	void url_parse_local(
89	const char *zUrl,
90	unsigned int urlFlags,
91	UrlData *pUrlData
92	){
93	int i, j, c;
94	char *zFile = 0;
95	int bPrompted = 0;
96	int bSetUrl = 1;
97
98	memset(pUrlData, 0, sizeof(UrlData));
99
100	if( zUrl==0 ){
101	zUrl = db_get("last-sync-url", 0);
102	if( zUrl==0 ) return;
103	pUrlData->passwd = unobscure(db_get("last-sync-pw", 0));
104	bSetUrl = 0;
105	}
106
107	if( strncmp(zUrl, "http://", 7)==0
108	\|\| strncmp(zUrl, "https://", 8)==0
109	\|\| strncmp(zUrl, "ssh://", 6)==0
110	){
111	int iStart;
112	char *zLogin;
113	char *zExe;
114	char cQuerySep = '?';
115
116	pUrlData->isFile = 0;
117	if( zUrl[4]=='s' ){
118	pUrlData->isHttps = 1;
119	pUrlData->protocol = "https";
120	pUrlData->dfltPort = 443;
121	iStart = 8;
122	}else if( zUrl[0]=='s' ){
123	pUrlData->isSsh = 1;
124	pUrlData->protocol = "ssh";
125	pUrlData->dfltPort = 22;
126	pUrlData->fossil = "fossil";
127	iStart = 6;
128	}else{
129	pUrlData->isHttps = 0;
130	pUrlData->protocol = "http";
131	pUrlData->dfltPort = 80;
132	iStart = 7;
133	}
134	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!='@'; i++){}
135	if( c=='@' ){
136	/* Parse up the user-id and password */
137	for(j=iStart; j<i && zUrl[j]!=':'; j++){}
138	pUrlData->user = mprintf("%.*s", j-iStart, &zUrl[iStart]);
139	dehttpize(pUrlData->user);
140	if( j<i ){
141	pUrlData->passwd = mprintf("%.*s", i-j-1, &zUrl[j+1]);
142	dehttpize(pUrlData->passwd);
143	}
144	if( pUrlData->isSsh && pUrlData->passwd ){
145	zLogin = mprintf("%t:*@", pUrlData->user);
146	}else{
147	zLogin = mprintf("%t@", pUrlData->user);
148	}
149	for(j=i+1; (c=zUrl[j])!=0 && c!='/' && c!=':'; j++){}
150	pUrlData->name = mprintf("%.*s", j-i-1, &zUrl[i+1]);
151	i = j;
152	}else{
153	for(i=iStart; (c=zUrl[i])!=0 && c!='/' && c!=':'; i++){}
154	pUrlData->name = mprintf("%.*s", i-iStart, &zUrl[iStart]);
155	zLogin = mprintf("");
156	}
157	url_tolower(pUrlData->name);
158	if( c==':' ){
159	pUrlData->port = 0;
160	i++;
161	while( (c = zUrl[i])!=0 && fossil_isdigit(c) ){
162	pUrlData->port = pUrlData->port*10 + c - '0';
163	i++;
164	}
165	pUrlData->hostname = mprintf("%s:%d", pUrlData->name, pUrlData->port);
166	}else{
167	pUrlData->port = pUrlData->dfltPort;
168	pUrlData->hostname = pUrlData->name;
169	}
170	dehttpize(pUrlData->name);
171	pUrlData->path = mprintf("%s", &zUrl[i]);
172	for(i=0; pUrlData->path[i] && pUrlData->path[i]!='?'; i++){}
173	if( pUrlData->path[i] ){
174	pUrlData->path[i] = 0;
175	i++;
176	}
177	zExe = mprintf("");
178	while( pUrlData->path[i]!=0 ){
179	char zName, zValue;
180	zName = &pUrlData->path[i];
181	zValue = zName;
182	while( pUrlData->path[i] && pUrlData->path[i]!='=' ){ i++; }
183	if( pUrlData->path[i]=='=' ){
184	pUrlData->path[i] = 0;
185	i++;
186	zValue = &pUrlData->path[i];
187	while( pUrlData->path[i] && pUrlData->path[i]!='&' ){ i++; }
188	}
189	if( pUrlData->path[i] ){
190	pUrlData->path[i] = 0;
191	i++;
192	}
193	if( fossil_strcmp(zName,"fossil")==0 ){
194	pUrlData->fossil = zValue;
195	dehttpize(pUrlData->fossil);
196	zExe = mprintf("%cfossil=%T", cQuerySep, pUrlData->fossil);
197	cQuerySep = '&';
198	}
199	}
200
201	dehttpize(pUrlData->path);
202	if( pUrlData->dfltPort==pUrlData->port ){
203	pUrlData->canonical = mprintf(
204	"%s://%s%T%T%s",
205	pUrlData->protocol, zLogin, pUrlData->name, pUrlData->path, zExe
206	);
207	}else{
208	pUrlData->canonical = mprintf(
209	"%s://%s%T:%d%T%s",
210	pUrlData->protocol, zLogin, pUrlData->name, pUrlData->port,
211	pUrlData->path, zExe
212	);
213	}
214	if( pUrlData->isSsh && pUrlData->path[1] ) pUrlData->path++;
215	free(zLogin);
216	}else if( strncmp(zUrl, "file:", 5)==0 ){
217	pUrlData->isFile = 1;
218	if( zUrl[5]=='/' && zUrl[6]=='/' ){
219	i = 7;
220	}else{
221	i = 5;
222	}
223	zFile = mprintf("%s", &zUrl[i]);
224	}else if( file_isfile(zUrl) ){
225	pUrlData->isFile = 1;
226	zFile = mprintf("%s", zUrl);
227	}else if( file_isdir(zUrl)==1 ){
228	zFile = mprintf("%s/FOSSIL", zUrl);
229	if( file_isfile(zFile) ){
230	pUrlData->isFile = 1;
231	}else{
232	free(zFile);
233	fossil_fatal("unknown repository: %s", zUrl);
234	}
235	}else{
236	fossil_fatal("unknown repository: %s", zUrl);
237	}
238	pUrlData->flags = urlFlags;
239	if( pUrlData->isFile ){
240	Blob cfile;
241	dehttpize(zFile);
242	file_canonical_name(zFile, &cfile, 0);
243	free(zFile);
244	pUrlData->protocol = "file";
245	pUrlData->path = "";
246	pUrlData->name = mprintf("%b", &cfile);
247	pUrlData->canonical = mprintf("file://%T", pUrlData->name);
248	blob_reset(&cfile);
249	}else if( pUrlData->user!=0 && pUrlData->passwd==0 && (urlFlags & URL_PROMPT_PW) ){
250	url_prompt_for_password();
251	bPrompted = 1;
252	}
253	if( urlFlags & URL_REMEMBER ){
254	if( bSetUrl ){
255	db_set("last-sync-url", pUrlData->canonical, 0);
256	}
257	if( !bPrompted && pUrlData->passwd && pUrlData->user ){
258	db_set("last-sync-pw", obscure(pUrlData->passwd), 0);
259	}
260	}
261	}
262
263	/*
264	** Parse the given URL, which describes a sync server. Populate variables
265	** in the global "g" structure as follows:
266	**
	@@ -68,175 +285,14 @@
285	**
286	** ssh://userid:password@host:port/path?fossil=path/to/fossil.exe
287	**
288	*/
289	void url_parse(const char *zUrl, unsigned int urlFlags){
290	UrlData urlData;
291	memcpy(&urlData, GLOBAL_URL(), sizeof(UrlData));
292	url_parse_local(zUrl, urlFlags, &urlData);
293	memcpy(GLOBAL_URL(), &urlData, sizeof(UrlData));

































































































































































294	}
295
296	/*
297	** COMMAND: test-urlparser
298	**
	@@ -428,36 +484,48 @@
484	}
485	return blob_str(&p->url);
486	}
487
488	/*
489	** Prompt the user for the password that corresponds to the "user" member of
490	** the provided UrlData structure. Store the result into the "passwd" member
491	** of the provided UrlData structure.
492	*/
493	void url_prompt_for_password_local(UrlData *pUrlData){
494	if( pUrlData->isSsh \|\| pUrlData->isFile ) return;
495	if( isatty(fileno(stdin))
496	&& (pUrlData->flags & URL_PROMPT_PW)!=0
497	&& (pUrlData->flags & URL_PROMPTED)==0
498	){
499	pUrlData->flags \|= URL_PROMPTED;
500	pUrlData->passwd = prompt_for_user_password(pUrlData->user);
501	if( pUrlData->passwd[0]
502	&& (pUrlData->flags & (URL_REMEMBER\|URL_ASK_REMEMBER_PW))!=0
503	){
504	if( save_password_prompt() ){
505	pUrlData->flags \|= URL_REMEMBER_PW;
506	if( pUrlData->flags & URL_REMEMBER ){
507	db_set("last-sync-pw", obscure(pUrlData->passwd), 0);
508	}
509	}
510	}
511	}else{
512	fossil_fatal("missing or incorrect password for user \"%s\"",
513	pUrlData->user);
514	}
515	}
516
517	/*
518	** Prompt the user for the password for g.urlUser. Store the result
519	** in g.urlPasswd.
520	*/
521	void url_prompt_for_password(void){
522	UrlData urlData;
523	memcpy(&urlData, GLOBAL_URL(), sizeof(UrlData));
524	url_prompt_for_password_local(&urlData);
525	memcpy(GLOBAL_URL(), &urlData, sizeof(UrlData));
526	}
527
528	/*
529	** Remember the URL if requested.
530	*/
531	void url_remember(void){
532

M src/xfer.c

+2 -2

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1892,12 +1892,12 @@
1892	1892
1893	1893	fossil_force_newline();
1894	1894	fossil_print(
1895	1895	"%s finished with %lld bytes sent, %lld bytes received\n",
1896	1896	zOpType, nSent, nRcvd);
1897		- transport_close();
1898		- transport_global_shutdown();
	1897	+ transport_close(GLOBAL_URL());
	1898	+ transport_global_shutdown(GLOBAL_URL());
1899	1899	db_multi_exec("DROP TABLE onremote");
1900	1900	manifest_crosslink_end();
1901	1901	content_enable_dephantomize(1);
1902	1902	db_end_transaction(0);
1903	1903	return nErr;
1904	1904

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1892,12 +1892,12 @@
1892
1893	fossil_force_newline();
1894	fossil_print(
1895	"%s finished with %lld bytes sent, %lld bytes received\n",
1896	zOpType, nSent, nRcvd);
1897	transport_close();
1898	transport_global_shutdown();
1899	db_multi_exec("DROP TABLE onremote");
1900	manifest_crosslink_end();
1901	content_enable_dephantomize(1);
1902	db_end_transaction(0);
1903	return nErr;
1904

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1892,12 +1892,12 @@
1892
1893	fossil_force_newline();
1894	fossil_print(
1895	"%s finished with %lld bytes sent, %lld bytes received\n",
1896	zOpType, nSent, nRcvd);
1897	transport_close(GLOBAL_URL());
1898	transport_global_shutdown(GLOBAL_URL());
1899	db_multi_exec("DROP TABLE onremote");
1900	manifest_crosslink_end();
1901	content_enable_dephantomize(1);
1902	db_end_transaction(0);
1903	return nErr;
1904

Fossil SCM

Keyboard Shortcuts