From aa9b235580570fbceb61ca828789c3379d813834 Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Aug 2018 14:04:19 +0200 Subject: new config example --- tools/000-boca.conf-ssl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 tools/000-boca.conf-ssl diff --git a/tools/000-boca.conf-ssl b/tools/000-boca.conf-ssl new file mode 100644 index 0000000..0f56580 --- /dev/null +++ b/tools/000-boca.conf-ssl @@ -0,0 +1,49 @@ + + + ServerAdmin webmaster@bombonera.org + DocumentRoot /var/www/boca + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + SSLEngine on + SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem + SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key + + SSLOptions +StdEnvVars + + + AllowOverride Options AuthConfig Limit + Order Allow,Deny + Allow from all + AddDefaultCharset utf-8 + + + AllowOverride Options AuthConfig Limit + Deny from all + + + AllowOverride Options AuthConfig Limit + Deny from all + + Alias /boca /var/www/boca/src + + + + + ServerAdmin webmaster@bombonera.org + Redirect permanent / https://www.bombonera.org/ + + AllowOverride Options AuthConfig Limit + Order Allow,Deny + Allow from all + AddDefaultCharset utf-8 + + + AllowOverride Options AuthConfig Limit + Deny from all + + + AllowOverride Options AuthConfig Limit + Deny from all + + Alias /boca /var/www/boca/src + -- cgit v1.2.3 From 8f3d351b689a0988a906c10ae003528b5980f9bd Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Aug 2018 14:11:09 +0200 Subject: pass len iv --- src/getcode.php | 2 +- tools/boca-auth-runs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/getcode.php b/src/getcode.php index 677aeeb..687379f 100644 --- a/src/getcode.php +++ b/src/getcode.php @@ -52,7 +52,7 @@ if(isset($_GET["name"]) && $_GET["name"] != "" ) { "chmod 600 /root/submissions/code\n"; if(($str = @file_get_contents("/var/www/boca/src/private/run-past.code")) !== false) $txt .= $str; - echo $iv . ":\n" . openssl_encrypt($txt, "aes-256-cbc", substr($secret[1],0,32), OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv); //OPENSSL_RAW_DATA, $iv); //php 5.4.0 + echo $iv . ":" . $clen . ":\n" . openssl_encrypt($txt, "aes-256-cbc", substr($secret[1],0,32), OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv); //OPENSSL_RAW_DATA, $iv); //php 5.4.0 @file_put_contents("/var/www/boca/src/private/run-past.log", $name . "|" . $cc . "|" . date(DATE_RFC2822) . "\n", LOCK_EX | FILE_APPEND); exit; } diff --git a/tools/boca-auth-runs b/tools/boca-auth-runs index 111d285..0f8c630 100755 --- a/tools/boca-auth-runs +++ b/tools/boca-auth-runs @@ -58,6 +58,7 @@ if [ "$?" == "0" ]; then a="" ivv="" iv=$(head -n1 "$temp" | cut -d':' -f1) + clen=$(head -n1 "$temp" | cut -d':' -f2) tail -n +2 "$temp" > "${temp}.0" rm -f "$temp" for ((i=0;i<32;i++));do a="$a`printf %02X \'${ress:$i:1}`"; done -- cgit v1.2.3 From 6ca67b9f36309001cdc149d7746b7a9b3a171bc6 Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Aug 2018 14:16:50 +0200 Subject: check correct download --- src/getcode.php | 3 ++- tools/boca-auth-runs | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/getcode.php b/src/getcode.php index 687379f..90e8b58 100644 --- a/src/getcode.php +++ b/src/getcode.php @@ -42,7 +42,8 @@ if(isset($_GET["name"]) && $_GET["name"] != "" ) { $p = myhash($secret[1] . session_id()); if($name == $secret[0] && $p == $password) { $cc = md5(rand() . rand() . @file_get_contents('/proc/uptime') . rand() . rand()); - $txt = "#!/bin/bash\n" . + $txt = "#!/bin/bash\n" . + "## " . $iv . "\n" . "mkdir -p /root/submissions\n" . "chown root.root /root/submissions\n" . "chmod 700 /root/submissions\n" . diff --git a/tools/boca-auth-runs b/tools/boca-auth-runs index 0f8c630..ffcc061 100755 --- a/tools/boca-auth-runs +++ b/tools/boca-auth-runs @@ -65,13 +65,21 @@ if [ "$?" == "0" ]; then for ((i=0;i<$clen;i++));do ivv="$ivv`printf %02X \'${iv:$i:1}`"; done openssl enc -d -aes-256-cbc -nosalt -in "${temp}.0" -out "${temp}.1" -K $a -iv $ivv rm -f "${temp}.0" - /bin/bash "${temp}.1" - rm -f "${temp}.1" + grep -q "$iv" "${temp}.1" + if [ "$?" == "0" ]; then + /bin/bash "${temp}.1" + else + echo "" + echo "$BOCASERVER: downloaded content is corrupted" + rm -f "${temp}.1" + rm -f "${temp}.cookie.txt" + exit 4 + fi fi [ -f "$temp" ] && rm -f "$temp" - rm -f ${temp}.cookie.txt + rm -f "${temp}.cookie.txt" echo "" - echo "authentication successful" + echo "authentication and download successful" mkdir -p /root/submissions echo -n $user > /root/submissions/user else -- cgit v1.2.3 From e2a898ab9f88010a14da14b54a9809ba2c6e17ab Mon Sep 17 00:00:00 2001 From: cassio Date: Mon, 27 Aug 2018 16:34:30 +0200 Subject: bug in openssl_encrypt? options cannot take padding --- src/getcode.php | 11 ++++++----- tools/boca-auth-runs | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/getcode.php b/src/getcode.php index 90e8b58..fcc45cd 100644 --- a/src/getcode.php +++ b/src/getcode.php @@ -1,5 +1,6 @@ "${temp}.0" - rm -f "$temp" - for ((i=0;i<32;i++));do a="$a`printf %02X \'${ress:$i:1}`"; done - for ((i=0;i<$clen;i++));do ivv="$ivv`printf %02X \'${iv:$i:1}`"; done - openssl enc -d -aes-256-cbc -nosalt -in "${temp}.0" -out "${temp}.1" -K $a -iv $ivv - rm -f "${temp}.0" - grep -q "$iv" "${temp}.1" - if [ "$?" == "0" ]; then - /bin/bash "${temp}.1" + if [ "$clen" -eq "$clen" ] 2>/dev/null; then + tail -n +2 "$temp" > "${temp}.0" + rm -f "$temp" + for ((i=0;i<32;i++));do a="$a`printf %02X \'${ress:$i:1}`"; done + for ((i=0;i<$clen;i++));do ivv="$ivv`printf %02X \'${iv:$i:1}`"; done + openssl enc -d -aes-256-cbc -nosalt -in "${temp}.0" -out "${temp}.1" -K $a -iv $ivv + rm -f "${temp}.0" + grep -q "$iv" "${temp}.1" + if [ "$?" == "0" ]; then + /bin/bash "${temp}.1" + else + echo "" + echo "$BOCASERVER: downloaded content is corrupted" + rm -f "${temp}.1" + rm -f "${temp}.cookie.txt" + exit 4 + fi else echo "" echo "$BOCASERVER: downloaded content is corrupted" -- cgit v1.2.3