simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #370 from StefanAlexandruBogdan/master

Browse source 
Add support for using ShellInABox with a custom port in SSH service.
This commit is contained in:
Luka Krajger 2016-05-04 06:30:26 -04:00
commit 0f1e9ba31c
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
shellinabox/service.c
View file

@ -121,18 +121,27 @@ void initService(struct Service *service, const char *arg) {
service->group = NULL;
check(service->cwd = strdup("/"));
char *host;
char *sshPort;
check(host = strdup("localhost"));
check(sshPort = strdup("22"));
if ((ptr = strchr(arg, ':')) != NULL) {
check(ptr = strdup(ptr + 1));
char *end;
if ((end = strchr(ptr, ':')) != NULL) {
*end = '\000';
}
ptr = ptr + 1;
if (*ptr) {
char * tmp = strchr(ptr, ':');
if(tmp == NULL)//if the second ":" is not found, keep as host whatever is after first ":"
{
free(host);
host = ptr;
} else {
free(ptr);
host = strdup(ptr);
}
else // if we find a second ":", keep as a host whatever is in between first ":" and second ":" and as sshPort whatever is after second ":"
{
int size = (tmp - ptr + 1);
free(host);
host = malloc(size);
memset(host, 0, size);
memcpy(host, ptr , size-1);
sshPort = strdup (tmp + 1);
}
}
}
@ -148,6 +157,14 @@ void initService(struct Service *service, const char *arg) {
}
}
// Don't allow manipulation of the SSH command line through "creative" use
// of the port.
for (char *h = sshPort; *h; h++) {
char ch = *h;
if (!(ch >= '0' && ch <= '9')) {
fatal("[config] Invalid port \"%s\" in service definition!", sshPort);
}
}
service->cmdline = stringPrintf(NULL,
"ssh -a -e none -i /dev/null -x -oChallengeResponseAuthentication=no "
"-oCheckHostIP=no -oClearAllForwardings=yes -oCompression=no "
@ -162,8 +179,9 @@ void initService(struct Service *service, const char *arg) {
// feature, we cannot be sure that it is available on the
// target server. Removing it for the sake of Centos.
// "-oVisualHostKey=no"
" -oLogLevel=FATAL %%s@%s", host);
" -oLogLevel=FATAL -p%s %%s@%s",sshPort, host);
free(host);
free(sshPort);
} else {
service->useLogin = 0;