From 63dddda80dbeae1bb93b07e1c66b0ab25041480f Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Sat, 6 Oct 2018 16:15:39 -0600 Subject: [PATCH] glorious success --- badstunclient.crt | 29 --------------------------- badstunclient.key | 51 ----------------------------------------------- build.sh | 10 +++------- caddyfile | 15 -------------- do.sh | 5 +++++ stunclient.crt | 29 --------------------------- stunclient.key | 51 ----------------------------------------------- stunfile | 14 ------------- stunserver.crt | 30 ---------------------------- stunserver.key | 51 ----------------------------------------------- test.sh | 24 ++++++++++++++++------ 11 files changed, 26 insertions(+), 283 deletions(-) delete mode 100644 badstunclient.crt delete mode 100644 badstunclient.key delete mode 100644 caddyfile create mode 100644 do.sh delete mode 100644 stunclient.crt delete mode 100644 stunclient.key delete mode 100644 stunfile delete mode 100644 stunserver.crt delete mode 100644 stunserver.key diff --git a/badstunclient.crt b/badstunclient.crt deleted file mode 100644 index 9e7d573..0000000 --- a/badstunclient.crt +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8DCCAtgCAQEwDQYJKoZIhvcNAQELBQAwPjELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAlVUMQ4wDAYDVQQKDAVicmVlbDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTE4 -MTAwNjIwMzU1M1oXDTE5MTAwNjIwMzU1M1owPjELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAlVUMQ4wDAYDVQQKDAVicmVlbDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjAN -BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwSSfVGYmy+de+GXDM0YlKBVgZagF -kW53wvQipWX0lzJbqZYr5ZPvOJJxREnK4uwJnM3rv/ZyvyWnpXtzMOggHLSMZi7e -Pp943iqsCGdu4bLa5/u7JOfceqtPDXaQ4/et4Xv7VyrOjAuiF9R+s/Fvc3KNviyN -la1239Q73pot5ku2SmvmBx2im032K4WZRx6Hq3e1ik7Al/i+L5y/d2/ZhemjDZ36 -mSk11MpWtYsg4wnxem4TeJRNs00oJy+vxxDA/ClJETE4YeIFl3jiIg5rJVuQO167 -BrsVlTL1pFWFwYdhdHtYZKkEUVwQ+rzqg2B0fydJh4k4wQSkWp2NojoVRP+cykHv -/NOOe2zCU1N41nNYn1OS6uqEtKE6YSL1RtNM281CEe9YwRlefi6J/EEvBzfM5WxI -RvxNYHt9NKuumCv/v1KZT1GxkK8ay6rPpm3dYukuzdWPS6+CUhFvZ0IZKP5kMpR6 -pgMgxLKJN/TXL5+qi4MOsAODfUve8jh9QXdjJAYIRxgohVfvrnThsWs4pyETvkI4 -X4qP8z2D0pycc7MbW24s0731YNwd+Rv1M0/w7zWUu0I25vbG8bdWiLm2gX+751+L -7C3Zngg1Dd3RKeFXOqz9ySYhBZQWgLnpmQ6mnBpA3QwIHwqRYzrySiPEvmymTR6j -wWRucLv3OK9cnFUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAVwvp34mbhPKX9r1Q -i0/WxlTNTsbAqQl+xZo9TXwuRWQUKUs1I8by8x3N/ECd//NSx8/Y4BQQe8K/I7cN -v+THaIl4a9e7K8jKm0PZRKnXrCGJEiG3FYEKFgK+Rhn1/hvxq+GBTTW72MwoKH+c -nC+9StOrDwjBu1yWX4YJXnBQUaoy1t8lmHARnwmLVmz0P3D9FqkfQ4UFnWeFdSVC -kpGmwNYEuFUO+GlNd1ZSzN6Zo/2KSfzNWqlINx/XLHf51Yh9S6pOgaKp8RqZACR1 -ao6JdZQLA6VH+j1TDTds5zdAENY9Iw4EUyLOY3kuKc/AlF0rnSvMgzF6DkhuScef -kVuGM7nF72svjmFIhfvt85uHhhW+a4wP7bI+DuFiRP9AwVfIQRrhz0iNT6dwKWxP -6otPgp7Fz21tEB6KoopK/e0tEE8hXzdnePmRBtYbd3qVDdG6AVcs5YNCyakizby1 -R+4w3OWS5YvNA6Gp1InqnF5zvB4k8KdCYH182JGmf555xQu2Hy3D+TiCyQwa9pBk -Q3XfXhKprM079KcQbvulIYhARXFxGBJf7Urm6V24Vs2mo3e61r1oYzZd4qnlGyFD -EANAkWt6Y92lkjbN6HQfxf1kRXM47IkfnGuvWKLRlmRvCEmXqtgBkgghTXtBHEYb -qXv2RADEqBlAjspT3lEhlP9RKI8= ------END CERTIFICATE----- diff --git a/badstunclient.key b/badstunclient.key deleted file mode 100644 index b447076..0000000 --- a/badstunclient.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 -Ufg7kwKCAQEApySLTV5FAUBqnJsWrhPum5kzQU+8l95Eu/XFZ+onIORcO9MESuYu -sImqqg8XSlnWDiqeF263onNM+EK72U4UyUHRFSuICaNWgOaJqcY3mjBbPixVsBFY -cZIoYQ+GAhv+tYWRdrAdzizAmCyhd4hlrPGxDk9rsUI2FdlyE7+dV1khp6XHCUR2 -1UEQcSKEApnBfhlekaxyTnSyQs5VhpSut7BJ36fwO+wbPZUaVw/Dh0RlytuslHq7 -5dDtV2BATBcBSjk438j/8RKa4RM65WWIpPpMORTAPjyMaKBo69p+OFVOlbnmP7ZH -H1LlQjy873hFX1iAxYWgjErXucwJnxs99wKCAQBWZAoayHYpgCeNFvuJ+dTalwOz -yDbv7qplaWKLJlIriR36P27+KO8Jb6Ctc10iVrYqXRc+zrbniqRbpLbz7HrXOxJA -hYwWXVd9DigKy0+2ISnOndrgFZihdb/jy9+SZur+mNM+H+dlLVHF3kagnHZxRpfH -eSRvlLh7DL5JdpeGaly5gYQHPcLqVmPrZhA5TPw7zKu1MUj3DHrE+OPTPnMaCFgf -i3sC+fNi01fQAoznyrwr+NzqeY9XFCKwRsUA0t7DxZNsFRe7i9IXtUd3wWQVQmbO -2myKWmamoJVeHRoFjL6SuN+D3nN74v3K9SL9+PDCyUu+IVf4nc7rhS7xdoEd ------END RSA PRIVATE KEY----- diff --git a/build.sh b/build.sh index a1d0ee3..c9eafed 100644 --- a/build.sh +++ b/build.sh @@ -6,13 +6,9 @@ docker build -t caddsies . docker run --rm -it \ -p 2018:2018 \ - -v $(pwd)/caddyfile:/mnt/Caddyfile \ - -v $(pwd)/stunfile:/mnt/stunfile.conf \ - -v $(pwd)/stunserver.crt:/mnt/stunserver.crt \ - -v $(pwd)/stunserver.key:/mnt/stunserver.key \ - -v $(pwd)/stunclient.crt:/mnt/stunclient.crt \ - -e CADDYFILE=/mnt/Caddyfile \ - -e STUNFILE=/mnt/stunfile.conf \ + -v $(pwd)/mnt:/mnt \ + -e CADDYFILE=/mnt/caddyfile \ + -e STUNFILE=/mnt/stunfile \ -e STUNSERVERCRT=/mnt/stunserver.crt \ -e STUNSERVERKEY=/mnt/stunserver.key \ -e STUNCLIENTCRT=/mnt/stunclient.crt \ diff --git a/caddyfile b/caddyfile deleted file mode 100644 index 6be51e5..0000000 --- a/caddyfile +++ /dev/null @@ -1,15 +0,0 @@ -localhost { - forwardproxy { - #basicauth breel ok - #probe_resistance secretlink.localhost - hide_ip - hide_via - response_timeout 30 - dial_timeout 10 - acl { - allow 192.168.0.0/16 - deny all - } - } - log /caddy-access.log -} diff --git a/do.sh b/do.sh new file mode 100644 index 0000000..b2c7006 --- /dev/null +++ b/do.sh @@ -0,0 +1,5 @@ +prox=https://bel.house \ +clientkey=/tmp/certs/client.key \ +clientcrt=/tmp/certs/client.crt \ +servercrt=/tmp/certs/server.crt \ +bash test.sh 192.168.0.86:8080/vpntor diff --git a/stunclient.crt b/stunclient.crt deleted file mode 100644 index 6f048b8..0000000 --- a/stunclient.crt +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8DCCAtgCAQEwDQYJKoZIhvcNAQELBQAwPjELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAlVUMQ4wDAYDVQQKDAVicmVlbDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTE4 -MTAwNjIwNDQ0NVoXDTI4MTAwMzIwNDQ0NVowPjELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAlVUMQ4wDAYDVQQKDAVicmVlbDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjAN -BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxmLyhMvlK7cHCuR7bRbjrv0Fs3vi -w37bfFYF625fg3Y+N9rvNKRUO+bJsPAAuPDM6wk+sfs/2E/xbnhINRdgI9M5iDvf -YV9Ot4MxhA0Etg5OcLtYi9tBoCiwqTinA9Tp4vB/GBKmGpKn6fgfz4+/BBXgq7Ao -ZbjIn0fzJVIaLQ/RvY6brOdQQErgzE6Ek3TNFQ7SsjnP+WMdTm5jBTHS0WyvvdJf -VVfqUg8mVra7oqxCSlOia87gFr4vbM8eW110DKIY/nde4l02kfK66uJhTghk151N -wsI/yVv+lG0DdB6fPg4omj7ZI9Yh25IJcsy3dR6gvXxx2clDQwGyQuJWhJsQw7Cx -T+p4D6Q3/WSiKAocLvRpPn9Jv+3XSx8V4wR30jF/cagpgbgGq1WLtp8PYj9TYWGH -etE0TcVMfcotRRBzcIcCwIpG8nAG4eIi65KszuxF0FxjAgRHwL2G50mU0cEdHd87 -1LG40sJue5TlRPJ8D//sWl+5k+SgPEhbi5hXNGxGEy6FBz7s5mXeF59kJNVDj0O9 -/WgHrYAbka4FNs2Ok6F5SDmxkl5d9cTaaJNYf1FCmC3UJLT5jSwH6ytEXPGQAx7S -4KEKbeOsfU8r8lmF191cEbZ1GvEurSeWOx1Zj3Z/nTYyrm1rEGmxslnzeATipLzm -UZc+9yBosJW2rH8CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEADFoWu58HKY7x/RxT -J4YSgkngRKg0yrbv0edjFwsL6Cf9/wuczUk+mdvxcduBhtY+AUC25SlvRnHS4sKX -D2tlciusRxuufASyGAf8QRhn3WUIaAgRvWR5IpwiNMzE0Spq5dK9MFFeFEU8Azi0 -Aso1YtDkm1vqBFKgtj8z/tvGQSwkYTsC+CocZYdK0/l56/L3fyzj3tHrw8krJYpS -oeK4HKNk/Wir8MqxonGyE4FAtnusPNLm+HJ0KMu1mXSf8Xs7o88FXw9b7Z6Ebz6k -VePhtj14u9D53JnvL65Pi5s1y0chuqfGZcpBMNotw9hbkgvJP1N5IeqcFstbK4UN -KOOBovUpHcVc9hlLpbmByaiAxoasFNOlRbANnNmw9DNDJvGOJmD/RavRKF57l1Zp -gVP2IkZs5vzNHDyUQkcJaZRQokWAG8Ht4RefYBiiqewC1QFlXHWPDfOtNm5L0r6Q -Uml1RFO5hDNHexy/YwVgLQrzqe3nne4EzuECb6vgYah1qSHrRBMd9w0O+urfsvlK -3k5/7S0L/aAFo8MKnbrLdNktcw4XJpuhvvMImZUMn4PAtbSYFDMewR1ia+TNwMI3 -poaPzbQuTpjJtfu6wdg/4/GKiZmNrwuL1OLAGHzstruqmrBhIN0YWCXBCsD+sAfQ -RI0xfxJjl5XNHTT981kFQu3ylXE= ------END CERTIFICATE----- diff --git a/stunclient.key b/stunclient.key deleted file mode 100644 index abf6f71..0000000 --- a/stunclient.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/stunfile b/stunfile deleted file mode 100644 index 62dfbbc..0000000 --- a/stunfile +++ /dev/null @@ -1,14 +0,0 @@ -; client = no - -foreground=yes -output=/stun-access.log -verifyPeer=yes -requireCert=yes - -cert=/etc/stunserver.crt -key=/etc/stunserver.key -CAfile=/etc/stunclient.crt - -[default] -accept=2018 -connect=2015 diff --git a/stunserver.crt b/stunserver.crt deleted file mode 100644 index 97e2a82..0000000 --- a/stunserver.crt +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFJDCCAwygAwIBAgIJAJAXG1lEbjL3MA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV -BAYTAlVTMQswCQYDVQQIDAJVVDEOMAwGA1UECgwFYnJlZWwxEjAQBgNVBAMMCWxv -Y2FsaG9zdDAeFw0xODEwMDYyMDQ0NDVaFw0yODEwMDMyMDQ0NDVaMD4xCzAJBgNV -BAYTAlVTMQswCQYDVQQIDAJVVDEOMAwGA1UECgwFYnJlZWwxEjAQBgNVBAMMCWxv -Y2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK+c42NEKLAN -Ks138np6ry7bufdt+9Sv0qkyVq7Chh/btVAmWw42ydvDa4fyX1Ey9B8VOBDqknz2 -yky9g81g1epB365j/Fp9clG5TqHbxZUcqXDosgWcDvtvZ1Pc1qzi4/2JB+0kciTY -3NoSlDm9waggRulp6YmMosNOf149FqVG7yhGt+lflKw6CqEX4kqvE17Vv9tbIrDH -QLk0OIM/wCWRqIKMYUn4r8ETyFb+bI3IAXVXNwcKFxORXGt56jgpMboPHgZtgA5m -mpZpzsdhNg9Jj6Y1LtM2oRKzG7ZYUDEAwNBbP1geCGIGNhK9AokxLrRy84LYfd99 -MMAvkljAIbV7Y40oCr+3mI71pJ8foeRRv8pozlBQG7mVBKeJsoHbeQs56210KeeB -x1uuaJvWVfpVBiI6Uv4C8XTNtWaStb3pTP73crqOV6+bJzsb++GPvETVeoRB8QzX -MbpDySkXzzPE9yACZXbuybL6rGmzLdj1Yk/s8Ayj7EfbCO9lu9Zxn23xPjQPXy3C -6qax3mYpP8mtp3boMgY+U94ijjimsII3s7BQgBdsj24HreZ6cvMOdh4kse45+Woe -3fn9l2qE+0odlJ1y0e7YCl8AcM+h8bIVMSCz5k8QEEsmUD3PfAO797QDfO1namRp -uNfsUAZ7Jf2lkm8M2qvOk+1aHpfckohTAgMBAAGjJTAjMCEGA1UdEQQaMBiCCWxv -Y2FsaG9zdIILKi5sb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggIBAKgUFRqZR6eO -FfKH0lwVMOkHAT2pZepyfIDmXcwVlfX5gRvFvsPK0ikMfd7osbXSz+hftJilWMlS -EGwIEwgNUFBwm32gZbBNPRmTxw8gOn8QL82BIHW0c9ZNrofGRB8MrxhGIYe/GByP -PX1B9RbINdXesu+kAB+5c89iUrlaTH361EBCockwHa0T9YGyFSL9mbVHU1VIepQa -piQkceA4OTJvnXzfxl8IWdzSUOJE4wYu7jL/+FdJnhFCl9qemnXc+Ta5Z5MWK9lp -P940cVZKDxu1somVvWxuLYMUdQNqqU8kZ+O83VDNfU3b8X0X6bI3l9hEQbk1rqQw -DQDp708ezKv7FZbj4QJS964L3TB2Rf1BCYG3LHLnDAKLZah3H7qC9p6nSxPUdwLp -rI7z/3eflQC55H+I7uZHwAV5N4m4gcBrzQbYJ7FJmronqbK8trwRmfEkGWXVk8Qt -Hc02yO7plYvrixT/jvrSd6ksKsTmddpCOJDcurWaF+cY+nWdLbbnfht8JADyJoW1 -luU6iAmOZUTNoFrm0nnCeOpoST5b8oX5viaKkxtfvh9uHS4u1gTFeEu5n4Xk4lkv -ghYsdZGpo+64kA6io6CRBp8jhePRAIwlIt5fBr3PCyFVX2yGyfA8fJCmp4+FpHB0 -d1W4U5YF8cB2Buhj9OQYCCTC9XRTkK0I ------END CERTIFICATE----- diff --git a/stunserver.key b/stunserver.key deleted file mode 100644 index 9b638b6..0000000 --- a/stunserver.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/test.sh b/test.sh index b0965fa..22c1af9 100644 --- a/test.sh +++ b/test.sh @@ -3,6 +3,8 @@ addr="${1:-${addr:-"192.168.0.86:8080/vpntor"}}" pport="${2:-${pport:-2018}}" +proxycacert="--proxy-cacert ./mnt/stunserver.crt" + if ((pport==2018)); then prox="${3:-${prox:-https://localhost}}" else @@ -10,14 +12,24 @@ else fi if [ "$badcert" ]; then - client="--proxy-key ./badstunclient.key --proxy-cert ./badstunclient.crt" -elif [ -z "$nocert" ]; then - client="--proxy-key ./stunclient.key --proxy-cert ./stunclient.crt" + client="--proxy-key ./mnt/badstunclient.key --proxy-cert ./mnt/badstunclient.crt" +elif [ "$nocert" ]; then + true +elif [ "$clientkey" ] && [ "$clientcrt" ] && [ "$servercrt" ]; then + client="--proxy-key $clientkey --proxy-cert $clientcrt" + proxycacert="--proxy-cacert $servercrt" +else + client="--proxy-key ./mnt/stunclient.key --proxy-cert ./mnt/stunclient.crt" fi -curl \ #-v \ - --proxy-cacert ./stunserver.crt \ +echo curl -v \ + $proxycacert \ + $client \ + -x $prox:$pport \ + $addr + +curl -v \ + $proxycacert \ $client \ - -U breel:ok \ -x $prox:$pport \ $addr