mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-20 02:27:51 +01:00
Code Issues Projects Releases Wiki Activity

tor: don't immediately fail if we can't open cookie file.

Browse Source 
We might still be offered password authentication, for example.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-05-10 08:48:24 +09:30
parent d5e4d52563
commit 2d840706df
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lightningd/tor.c
View File

@ -114,6 +114,8 @@ static void make_onion(struct lightningd *ld, struct rbuf *rbuf)
static void negotiate_auth(struct lightningd *ld, struct rbuf *rbuf) static void negotiate_auth(struct lightningd *ld, struct rbuf *rbuf)
{ {
char *line; char *line;
char *cookiefile = NULL;
int cookiefileerrno;
tor_send_cmd(ld, rbuf, "PROTOCOLINFO 1"); tor_send_cmd(ld, rbuf, "PROTOCOLINFO 1");
@ -145,10 +147,14 @@ static void negotiate_auth(struct lightningd *ld, struct rbuf *rbuf)
errx(1, "Tor protocolinfo bad line '%s'", line); errx(1, "Tor protocolinfo bad line '%s'", line);
*end = '\0'; *end = '\0';
/* If we can't access this, try other methods */
cookiefile = tal_strdup(tmpctx, p);
contents = grab_file(tmpctx, p); contents = grab_file(tmpctx, p);
if (!contents) if (!contents) {
err(1, "Cannot open Tor cookie file '%s'", p); cookiefileerrno = errno;
fprintf(stderr, "No cookies for me!\n");
continue;
}
discard_remaining_response(ld, rbuf); discard_remaining_response(ld, rbuf);
tor_send_cmd(ld, rbuf, tor_send_cmd(ld, rbuf,
tal_fmt(tmpctx, "AUTHENTICATE %s", tal_fmt(tmpctx, "AUTHENTICATE %s",
@ -159,6 +165,13 @@ static void negotiate_auth(struct lightningd *ld, struct rbuf *rbuf)
return; return;
} }
} }
/* Now report if we tried cookie file and it failed */
if (cookiefile) {
errno = cookiefileerrno;
err(1, "Could not open Tor cookie file '%s'", cookiefile);
}
errx(1, "Tor protocolinfo did not give auth"); errx(1, "Tor protocolinfo did not give auth");
} }