LBRYCommunity/cpuminer
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Hide passwords on the command line

Browse source 
Closes #76
This commit is contained in:
pooler 2014-05-10 23:45:48 +02:00
parent b01f8be868
commit f76c4d6273
1 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
cpu-miner.c
View file

@ -1447,6 +1447,12 @@ static void show_usage_and_exit(int status)
exit(status); exit(status);
} }
static void strhide(char *s)
{
if (*s) *s++ = 'x';
while (*s) *s++ = '\0';
}
static void parse_config(json_t *config, char *pname, char *ref); static void parse_config(json_t *config, char *pname, char *ref);
static void parse_arg(int key, char *arg, char *pname) static void parse_arg(int key, char *arg, char *pname)
@ -1496,6 +1502,7 @@ static void parse_arg(int key, char *arg, char *pname)
case 'p': case 'p':
free(rpc_pass); free(rpc_pass);
rpc_pass = strdup(arg); rpc_pass = strdup(arg);
strhide(arg);
break; break;
case 'P': case 'P':
opt_protocol = true; opt_protocol = true;
@ -1534,9 +1541,35 @@ static void parse_arg(int key, char *arg, char *pname)
free(rpc_user); free(rpc_user);
rpc_user = strdup(arg); rpc_user = strdup(arg);
break; break;
case 'o': /* --url */ case 'o': { /* --url */
p = strstr(arg, "://"); char *ap, *hp;
if (p) { ap = strstr(arg, "://");
ap = ap ? ap + 3 : arg;
hp = strrchr(arg, '@');
if (hp) {
*hp = '\0';
p = strchr(ap, ':');
if (p) {
free(rpc_userpass);
rpc_userpass = strdup(ap);
free(rpc_user);
rpc_user = calloc(p - ap + 1, 1);
strncpy(rpc_user, ap, p - ap);
free(rpc_pass);
rpc_pass = strdup(++p);
if (*p) *p++ = 'x';
v = strlen(hp + 1) + 1;
memmove(p + 1, hp + 1, v);
memset(p + v, 0, hp - p);
hp = p;
} else {
free(rpc_user);
rpc_user = strdup(ap);
}
*hp++ = '@';
} else
hp = ap;
if (ap != arg) {
if (strncasecmp(arg, "http://", 7) && if (strncasecmp(arg, "http://", 7) &&
strncasecmp(arg, "https://", 8) && strncasecmp(arg, "https://", 8) &&
strncasecmp(arg, "stratum+tcp://", 14)) { strncasecmp(arg, "stratum+tcp://", 14)) {
@ -1546,38 +1579,20 @@ static void parse_arg(int key, char *arg, char *pname)
} }
free(rpc_url); free(rpc_url);
rpc_url = strdup(arg); rpc_url = strdup(arg);
strcpy(rpc_url + (ap - arg), hp);
} else { } else {
if (!strlen(arg) || *arg == '/') { if (*hp == '\0' || *hp == '/') {
fprintf(stderr, "%s: invalid URL -- '%s'\n", fprintf(stderr, "%s: invalid URL -- '%s'\n",
pname, arg); pname, arg);
show_usage_and_exit(1); show_usage_and_exit(1);
} }
free(rpc_url); free(rpc_url);
rpc_url = malloc(strlen(arg) + 8); rpc_url = malloc(strlen(hp) + 8);
sprintf(rpc_url, "http://%s", arg); sprintf(rpc_url, "http://%s", hp);
}
p = strrchr(rpc_url, '@');
if (p) {
char *sp, *ap;
*p = '\0';
ap = strstr(rpc_url, "://") + 3;
sp = strchr(ap, ':');
if (sp) {
free(rpc_userpass);
rpc_userpass = strdup(ap);
free(rpc_user);
rpc_user = calloc(sp - ap + 1, 1);
strncpy(rpc_user, ap, sp - ap);
free(rpc_pass);
rpc_pass = strdup(sp + 1);
} else {
free(rpc_user);
rpc_user = strdup(ap);
}
memmove(ap, p + 1, strlen(p + 1) + 1);
} }
have_stratum = !opt_benchmark && !strncasecmp(rpc_url, "stratum", 7); have_stratum = !opt_benchmark && !strncasecmp(rpc_url, "stratum", 7);
break; break;
}
case 'O': /* --userpass */ case 'O': /* --userpass */
p = strchr(arg, ':'); p = strchr(arg, ':');
if (!p) { if (!p) {
@ -1591,7 +1606,8 @@ static void parse_arg(int key, char *arg, char *pname)
rpc_user = calloc(p - arg + 1, 1); rpc_user = calloc(p - arg + 1, 1);
strncpy(rpc_user, arg, p - arg); strncpy(rpc_user, arg, p - arg);
free(rpc_pass); free(rpc_pass);
rpc_pass = strdup(p + 1); rpc_pass = strdup(++p);
strhide(p);
break; break;
case 'x': /* --proxy */ case 'x': /* --proxy */
if (!strncasecmp(arg, "socks4://", 9)) if (!strncasecmp(arg, "socks4://", 9))