From bd1a55813b6129fb0219b1e9c5d34ce21d7b9aaa Mon Sep 17 00:00:00 2001 From: Jon Lundy Date: Mon, 17 Sep 2018 15:56:21 -0600 Subject: [PATCH] update script and stuff --- assets/public/paste.sh | 6 +++--- assets/src/vendor/sour-is | 2 +- config.toml | 2 ++ public/paste.sh | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/assets/public/paste.sh b/assets/public/paste.sh index 503346c..ae6dfa7 100755 --- a/assets/public/paste.sh +++ b/assets/public/paste.sh @@ -28,7 +28,7 @@ HASH=$((echo -e "exp:\t$(date +%s -d ${PASTE_DATE})"; \ [ "$PASTE_BURN" -eq "1" ] && echo -e "burn:\ttrue"; \ [ "$PASTE_GZIP" -eq "1" ] && echo -e "zip:\ttrue"; \ echo; \ - cat /dev/stdin | $GZBIN | openssl aes-256-cbc -e -a -k $PASS) | \ + cat /dev/stdin | $GZBIN | openssl aes-256-cbc -md md5 -e -a -k $PASS) | \ curl -s -X POST ${PASTE_URL}/paste --data-binary @-) HASH_OK=$(echo $HASH | cut -c1-2) @@ -37,9 +37,9 @@ if [ "$HASH_OK" = "OK" ]; then HASH=$(echo $HASH | cut -f2 -d' ') echo "url: ${PASTE_URL}/#/${HASH}!${PASS}" - echo -n "shell: curl -s ${PASTE_URL}/api/get/${HASH} | sed '1,/^\$/d' | openssl aes-256-cbc -d -a -k ${PASS}" + echo -n "shell: curl -s ${PASTE_URL}/api/get/${HASH} | sed '1,/^\$/d' | openssl aes-256-cbc -md md5 -d -a -k ${PASS}" [ "$PASTE_GZIP" -eq "1" ] && echo " | gzip -dc" || echo; exit fi -echo $HASH +echo $HASH \ No newline at end of file diff --git a/assets/src/vendor/sour-is b/assets/src/vendor/sour-is index ba700a5..46cbe64 160000 --- a/assets/src/vendor/sour-is +++ b/assets/src/vendor/sour-is @@ -1 +1 @@ -Subproject commit ba700a53ba68931451537ce5423c9c2823a39848 +Subproject commit 46cbe64d1c0a8014976667fef853dae184cff9c2 diff --git a/config.toml b/config.toml index e69de29..de60ace 100644 --- a/config.toml +++ b/config.toml @@ -0,0 +1,2 @@ +[http] +listen = ":9015" \ No newline at end of file diff --git a/public/paste.sh b/public/paste.sh index 503346c..ae6dfa7 100755 --- a/public/paste.sh +++ b/public/paste.sh @@ -28,7 +28,7 @@ HASH=$((echo -e "exp:\t$(date +%s -d ${PASTE_DATE})"; \ [ "$PASTE_BURN" -eq "1" ] && echo -e "burn:\ttrue"; \ [ "$PASTE_GZIP" -eq "1" ] && echo -e "zip:\ttrue"; \ echo; \ - cat /dev/stdin | $GZBIN | openssl aes-256-cbc -e -a -k $PASS) | \ + cat /dev/stdin | $GZBIN | openssl aes-256-cbc -md md5 -e -a -k $PASS) | \ curl -s -X POST ${PASTE_URL}/paste --data-binary @-) HASH_OK=$(echo $HASH | cut -c1-2) @@ -37,9 +37,9 @@ if [ "$HASH_OK" = "OK" ]; then HASH=$(echo $HASH | cut -f2 -d' ') echo "url: ${PASTE_URL}/#/${HASH}!${PASS}" - echo -n "shell: curl -s ${PASTE_URL}/api/get/${HASH} | sed '1,/^\$/d' | openssl aes-256-cbc -d -a -k ${PASS}" + echo -n "shell: curl -s ${PASTE_URL}/api/get/${HASH} | sed '1,/^\$/d' | openssl aes-256-cbc -md md5 -d -a -k ${PASS}" [ "$PASTE_GZIP" -eq "1" ] && echo " | gzip -dc" || echo; exit fi -echo $HASH +echo $HASH \ No newline at end of file