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

Merge pull request #365 from mvanholsteijn/disable-peer-check

Browse source 
Disable peer check (issue #364)
This commit is contained in:
Luka Krajger 2016-02-26 06:45:06 -05:00
commit b778806356
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shellinabox/shellinaboxd.c
View file

@ -110,6 +110,7 @@ static int portMax;
static int localhostOnly = 0; static int localhostOnly = 0;
static int noBeep = 0; static int noBeep = 0;
static int numericHosts = 0; static int numericHosts = 0;
static int peerCheckEnabled = 1;
static int enableSSL = 1; static int enableSSL = 1;
static int enableSSLMenu = 1; static int enableSSLMenu = 1;
static int forceSSL = 1; // TODO enable http fallback with commandline option static int forceSSL = 1; // TODO enable http fallback with commandline option
@ -393,7 +394,7 @@ static int dataHandler(HttpConnection *http, struct Service *service,
} }
// Sanity check // Sanity check
if (!sessionIsNew && strcmp(session->peerName, httpGetPeerName(http))) { if (!sessionIsNew && peerCheckEnabled && strcmp(session->peerName, httpGetPeerName(http))) {
error("[server] Peername changed from %s to %s", error("[server] Peername changed from %s to %s",
session->peerName, httpGetPeerName(http)); session->peerName, httpGetPeerName(http));
httpSendReply(http, 400, "Bad Request", NO_MSG); httpSendReply(http, 400, "Bad Request", NO_MSG);
@ -824,6 +825,7 @@ static void usage(void) {
" --user-css=STYLES defines user-selectable CSS options\n" " --user-css=STYLES defines user-selectable CSS options\n"
" -v, --verbose enable logging messages\n" " -v, --verbose enable logging messages\n"
" --version prints version information\n" " --version prints version information\n"
" --disable-peer-check disable peer check on a session\n"
"\n" "\n"
"Debug, quiet, and verbose are mutually exclusive.\n" "Debug, quiet, and verbose are mutually exclusive.\n"
"\n" "\n"
@ -895,6 +897,7 @@ static void parseArgs(int argc, char * const argv[]) {
int hasSSL = serverSupportsSSL(); int hasSSL = serverSupportsSSL();
if (!hasSSL) { if (!hasSSL) {
enableSSL = 0; enableSSL = 0;
forceSSL = 0;
} }
int demonize = 0; int demonize = 0;
int cgi = 0; int cgi = 0;
@ -933,6 +936,7 @@ static void parseArgs(int argc, char * const argv[]) {
{ "user-css", 1, 0, 0 }, { "user-css", 1, 0, 0 },
{ "verbose", 0, 0, 'v' }, { "verbose", 0, 0, 'v' },
{ "version", 0, 0, 0 }, { "version", 0, 0, 0 },
{ "disable-peer-check", 0, 0, 0 },
{ 0, 0, 0, 0 } }; { 0, 0, 0, 0 } };
int idx = -1; int idx = -1;
int c = getopt_long(argc, argv, optstring, options, &idx); int c = getopt_long(argc, argv, optstring, options, &idx);
@ -1152,6 +1156,7 @@ static void parseArgs(int argc, char * const argv[]) {
warn("[config] Ignoring disable-ssl option, as SSL support is unavailable."); warn("[config] Ignoring disable-ssl option, as SSL support is unavailable.");
} }
enableSSL = 0; enableSSL = 0;
forceSSL = 0;
} else if (!idx--) { } else if (!idx--) {
// Disable SSL Menu // Disable SSL Menu
if (!hasSSL) { if (!hasSSL) {
@ -1241,6 +1246,9 @@ static void parseArgs(int argc, char * const argv[]) {
// Version // Version
printf("ShellInABox version " VERSION VCS_REVISION "\n"); printf("ShellInABox version " VERSION VCS_REVISION "\n");
exit(0); exit(0);
} else if (!idx--) {
// disable-peer-check
peerCheckEnabled = 0;
} }
} }
if (optind != argc) { if (optind != argc) {