From b2e6ad0d06249feb6e9927237eaea7ed79205d0e Mon Sep 17 00:00:00 2001 From: micdzied Date: Fri, 26 Oct 2018 11:24:45 +0200 Subject: [PATCH] modifications for FTPES vsftpd Change-Id: Id25506a3661fc5ce5b8a48ba02d346338be1db19 Issue-ID: INT-702 Signed-off-by: micdzied --- test/mocks/pnfsimulator/README.md | 10 ++- test/mocks/pnfsimulator/docker-compose.yml | 11 ++-- .../mocks/pnfsimulator/ftpes/files/ftpes-noone.txt | 1 + .../pnfsimulator/ftpes/files/onap/ftpes-onap.txt | 1 + .../ftpes/vsftpd/configuration/vsftpd_ssl.conf | 11 ++-- test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der | Bin 0 -> 962 bytes .../pnfsimulator/ftpes/vsftpd/tls/cert.pkcs12 | Bin 0 -> 2565 bytes test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.crt | 20 ------ test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.csr | 18 ------ test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.jks | Bin 2529 -> 0 bytes test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key | 27 -------- test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12 | Bin 2492 -> 0 bytes test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.crt | 20 ------ test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.csr | 18 ------ test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.der | Bin 848 -> 0 bytes test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.jks | Bin 3209 -> 0 bytes test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key | 27 -------- .../pnfsimulator/ftpes/vsftpd/tls/keystore.jks | Bin 0 -> 2312 bytes .../pnfsimulator/ftpes/vsftpd/tls/truststore.jks | Bin 0 -> 1250 bytes .../mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.crt | 23 +++++++ .../mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.key | 28 +++++++++ .../mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.pem | 50 +++++++++++++++ .../pnfsimulator/ftpes/vsftpd/tls/vsftpd_crt.pem | 23 +++++++ .../pnfsimulator/ftpes/vsftpd/tls/vsftpd_key.pem | 27 ++++++++ .../ftpes/vsftpd/tls/vsftpd_keys_generator.sh | 70 ++++++++++++++------- 25 files changed, 219 insertions(+), 166 deletions(-) create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.pkcs12 delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.crt delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.csr delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.jks delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12 delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.crt delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.csr delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.der delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.jks delete mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jks create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/truststore.jks create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.crt create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.key create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd.pem create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_crt.pem create mode 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_key.pem mode change 100755 => 100644 test/mocks/pnfsimulator/ftpes/vsftpd/tls/vsftpd_keys_generator.sh diff --git a/test/mocks/pnfsimulator/README.md b/test/mocks/pnfsimulator/README.md index d1f2a0c11..e53d72fb7 100644 --- a/test/mocks/pnfsimulator/README.md +++ b/test/mocks/pnfsimulator/README.md @@ -52,8 +52,14 @@ After that execute *./simulator.sh stop* and when it's finished *./simulator.sh In order to connect execute command *ftp -p localhost 2221* and, when requested, provide user and password. In order to download a file execute, while still being logged in, *get file-name-to-be-downloaded*. -###FTPES support for vsftpd server -TBD +###FTPES support for VSFTPD server +PNF Simulator allows to serve files via FTPES VSFTPD server. VSFTPD server has predefined user *onap* with password *pano*. +By default TLS support is enabled. Required certificates and keys are generated via vsftpd_certs_keys_generator.sh and located in ./ftpes/vsftpd/tls/ . +We can generate our own certificates and keys using that script and passing 'secret' password when you are asked for entering keystore password. In other cases just press ENTER to go on. +Configuration of VSFTPD server is located in ./ftpes/vsftpd/configuration/vsftpd_ssl.conf . +Docker-compose contains VSFTPD server image with it's configurations. + +In order to verify connection, please use *FileZilla* for testing. ###Developer mode For development of PNF Simulator, run *simulator.sh* start-dev in order to run minimal necessary set of supporting services such as Netopeer of FTP servers. diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml index 2084c6cef..adaa3eb2c 100644 --- a/test/mocks/pnfsimulator/docker-compose.yml +++ b/test/mocks/pnfsimulator/docker-compose.yml @@ -52,7 +52,7 @@ services: - ./ftpes/pure-ftpd/tls/:/etc/ssl/private/ environment: PUBLICHOST: localhost - ADDED_FLAGS: --tls=2 -d -d -O w3c:/var/log/pure-ftpd/transfer.log + ADDED_FLAGS: --tls=2 FTP_USER_HOME: onap restart: on-failure @@ -65,13 +65,14 @@ services: environment: FTP_USER: onap FTP_PASSWORD: pano - PASV_ADDRESS: 127.0.0.1 + PASV_ADDRESS: localhost PASV_MIN_PORT: 8001 PASV_MAX_PORT: 8010 volumes: - - ./ftpes/vsftpd/tls/ftp.crt:/etc/ssl/private/vsftpd.crt:ro - - ./ftpes/vsftpd/tls/ftp.key:/etc/ssl/private/vsftpd.key:ro - - ./ftpes/vsftpd/tls/dfc.crt:/home/vsftpd/onap/client.crt:ro + - ./ftpes/vsftpd/tls/vsftpd.crt:/etc/ssl/private/vsftpd.crt:ro + - ./ftpes/vsftpd/tls/vsftpd.key:/etc/ssl/private/vsftpd.key:ro - ./ftpes/vsftpd/configuration/vsftpd_ssl.conf:/etc/vsftpd_ssl.conf:ro + - ./ftpes/files/onap/ftpes-onap.txt:/home/vsftpd/onap/ftpes-onap.txt:ro + - ./ftpes/files/onap/ftpes-onap.txt:/srv/ftpes-onap.txt:ro restart: on-failure command: vsftpd /etc/vsftpd_ssl.conf diff --git a/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt b/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt index e69de29bb..3f1caaed7 100644 --- a/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt +++ b/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt @@ -0,0 +1 @@ +sample message \ No newline at end of file diff --git a/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt b/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt index e69de29bb..8e78dac41 100644 --- a/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt +++ b/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt @@ -0,0 +1 @@ +sample message v2 \ No newline at end of file diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf b/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf index 6d94ad827..3e9cd7c66 100644 --- a/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf +++ b/test/mocks/pnfsimulator/ftpes/vsftpd/configuration/vsftpd_ssl.conf @@ -39,8 +39,6 @@ pasv_max_port=8010 # SSL ssl_enable=Yes -rsa_cert_file=/etc/ssl/private/vsftpd.crt -rsa_private_key_file=/etc/ssl/private/vsftpd.key require_ssl_reuse=NO force_local_data_ssl=YES force_local_logins_ssl=YES @@ -49,7 +47,10 @@ allow_anon_ssl=NO ssl_tlsv1=YES ssl_sslv2=YES +ssl_sslv3=YES +rsa_cert_file=/etc/ssl/private/vsftpd.crt +rsa_private_key_file=/etc/ssl/private/vsftpd.key -require_cert=YES -ssl_request_cert=YES -ca_certs_file=/home/vsftpd/onap/client.crt +#require_cert=YES +#ssl_request_cert=YES +#ca_certs_file=/home/vsftpd/onap/client.crt \ No newline at end of file diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/cert.der new file mode 100644 index 0000000000000000000000000000000000000000..24ac26c69ce3db04118ff290c1807c7114461720 GIT binary patch literal 962 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 diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key deleted file mode 100644 index cca071a53..000000000 --- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAvNZtrFojtrXL/IbsxSVjKL4en7JNk2c5YsNOffAV1CGkpinh -Xv4udRbzjfEI2KE3JI3rgEcYkDx7w+HAevEl00L9AKsSHdQ7ABmcvCRNBTtvQrse -2tEhDHSVI5EcQHBq89jTrWxcZmmQ77UFUaDW2miiHvVSmG73xY3SMf/KkIkh1GoZ -vX3ayah/h0GkyEDxgTFkxfFgt6bUcbckOPZxY54S9fYJb4k9UtDaR07l+IeOnWV/ -1/Wx3aD2RfODZdsshUvjytpRM5kEBP7gVxcZimpxG8XBdjkaOy5nmx31y90XNoxO -2pIaHeVb4Pp60lHPiU3FnkcbANvQvzkKC4f5fQIDAQABAoIBAC0/1JfwIY6ukWq5 -ihLTmqcwp3Xs69neaknYMv7KgPCL/0Ax2OdCUS+NiF8C2vPN7cC8oSnj32bwl1eg -yNas4jt1WdrHI1gyetDTUlNi/3G5hDehTwtwAVNSvEoBg5uNVJOJ6W8tABcqRKir -39JnkBRV7kMs1dXhAU49ZZjFimyHhbdWeme8zcqC4lqk5ZYcXgCiOSYUNjeV39XC -aE/NlXS1d8dqnL/nXV3otvFMe7Ax/J+frlpALJGRCNlMNVT67c3pv+1FkXGPW/8q -WvrTPsWPL5lqykD+isgiLMW5GXQzyw07Ohf+7BBZmn0bKWEkEVC590IZ2KQgN19Q -jU80QaECgYEA9D3Kp3axg9IgvswpUOFjeCt0eviSRGlKNG0FEFT/mC00m88YUDw+ -iMi5nAPfnEiYi6Ql6ncvaohhMiHwlQQk51AKgsotSCJCwewO4UiAibqu47RoBXtR -R/3cPOqnE0YziTeIgbRxEoKU1iycXkdugxX8yToYc/vFSIeKEr/nD2cCgYEAxe3M -7pbBCLsCACbT/N4Ye9yUt5akKMOJPFLoGZe1COf8f2sp0QZc4IhtPIkE65VeC2yX -5+XRxjI1CHBZzu7QcBmdfEZbawWWM0Ehpgf3TUmzpLzgvTj4D697TBOc2S0oMo9o -4dT+7QOuw6vt2dTfm2cBCw/JibXIfQJ58W5K9XsCgYBCKkMuHq90QIZyaah/qq9h -rJP/hDtLoSJjFW2bwQsE1Ko901qI0ek28PmnVD1NfzUkDzHeVK9Zstxx0lP0aoz8 -xOg0CkU+F1nyYtqdGSEJLrOWKBdN9NxOHm19aywbwpbPg2XNjW5cT1e2tZsex0ce -5+P1N3HMadZGEcHL1oTn3QKBgBnLdQK/GOcnYApfBQ+WbkBuLd+DPV+mpBL9hwwW -zlwbx7dfYvK/zojgnsPd44tESx5YB7AMLnuS/YBdDAdA7l89p12T2cQn1TxWx6jY -ru0eps/YYb2nWATLTNlMUQuoq+1y7StJU/PVoAgWNwhFiuK42NT1OMG+tCM+mF/T -jOdTAoGBAOkVlTCF3OKHhNWrzX5dQGHicCczaciaAJtXbYg10HDSzzIMf4ypzzv7 -QfbTB9rF5mZBjtr2s2/DZw9PQGd434ZFJ3z8wD2HvtH26HhxVmqJKo1mqsR6FArW -GBPVq0LeUzfgQQahaeTkDC+nFvlq63AhUx+cAdNbb8VLEfih7Sns ------END RSA PRIVATE KEY----- diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12 b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/dfc.p12 deleted file mode 100644 index 2e9357ea329e3fbc0f489d2324d4a48dc1864568..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2492 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 iOZO^-fln>~o(UC?E(tXKww~W(LVu4lj({8 diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key deleted file mode 100644 index 575d98087..000000000 --- a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/ftp.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEA7qWey4GAP6r8HdEqYIXZs+aCz6WZCHNJyCkavNAEDrcR+m00 -RUcVPMT7zeSYNhDs43py8OqoYNcmxmeRu20llvFnhMrhfkZTNcQR4jrFkQ88tr73 -IZxu0/pXCv4+yrariXXdKpImmTnxlvfmIov0MARjfyJII4LFen0yLJpWWFsVrUox -GI56xemBZmOtxrmZKScHGJK5RGxrLmTukOvBHsOQP3vSWO7HSqrPMVP8qDRGkQJq -rH3x5g25Cz7VW3Y07Qfd3k9Y9c6tchGzECkMWVq9olGy0xcl6xQJcT4fAQ9TgbmS -LNLfdr59WoHHTD4somrPn/B9sAY4GHjs9w0IIwIDAQABAoIBAD1l1OXsqm828WhG -cQ2mQi1bp9n+c9HNv3TExoE/T1vt061HPUR5lkgtMc91+YcncZrQ3ROIe8t2bx5q -dP7whNRBxW1PuRYAx9W0XRmEH2JDtk4Z8YDvO0BETvKgGM2Uk6to7H7QXSfc1YAO -xWGr+iYEawjBbCfetCngXfFFv+M5BK2yh+dxw4ZLWscXwK4bbURE/YQUDhJADJsh -+ljjvP6IOAehGlHnrR/SscP+d7GA4IFfwJpSY/C+2Py0GJWnlf+HeoFysENp7QIh -xLtKAGHnc4Za1+ThLXm5PgT4bcrE6oqLAit/sLerWIaPERXEpnrWARwig8uzhgxH -y3eyKikCgYEA/j/stGlggGlRM5HrFVhuSh56YdI9VmiAhI4wS4BmYPUpUe3Qwfyc -EPtJ2msJNqJG2YLMVe6jVbjNaSLLDdaexD9kaUXv4rer4GmgPghITOnIFsBIgbQv -Qn1eD6MWX0R5YCV1+s5Umth/cVwyFNjpjqI6YlSzEfKNQmALa/ylUf8CgYEA8Eoy -wMfALNv/PlJE4r0ICuPVHIkwzuGZHD/Qteiait47JNwHUP6RfkcAIByLAJGxdAFo -eUBxV7MTvS/H0/E+z6F8IYuliSD3cnc4tI4wxFtGmAl14glvnmSivi21xify7Sim -FmmYF0qh+eGus8oDnL+UCw7ZCDpJbQAzNH58wd0CgYBoojAs8y0Wy8DyQzwHFdSV -xkNBXL+HfwxdARNZDyeTAXIW2JNQMkCcMH5tWB17kX8s5spnFwW7Mom+meYM9OV0 -CE6vkGuv1zzx5yZeQRRYKuIAkvOEBX5pk6SRNOHxJQH6kpAiPqXM8ApKwdGOiNJd -s9/pNchYO4Ts6w/oShpTSwKBgBoaBT9Zs29sCmLrrt3uaMQ+EXVDFdEzQl2GNRa9 -iKQTFdugJw9OR+Gutr3GO/c43Ezcpkudi3JaWoePfCZyqz8ErKY8NCQcN6TwfHFo -jLWXsKhtRqfiHITZK7B66Kb4yfOnGbuPhtzo14V8VWzkQdYyHVPCLiMtqbI0dlt6 -bfTlAoGBAIfJ87AXnXMWlT9GgPUe6R2Mjln5VgW2X+VAW6P1ALBjpVoyfJg6/xn3 -7SHweBnQ1PopSHGGBIjWvw9KuScaaGg0+1vgcmtJiiZukNJ+YlHYOg1oWcb+EacT -wAGeLZzRf+wKzpMT4cfCKVVxr5pTDXUmieI1VjxIVaZjxX+5RUE2 ------END RSA PRIVATE KEY----- diff --git a/test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jks b/test/mocks/pnfsimulator/ftpes/vsftpd/tls/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..6285f8e9ea5adb46692ead93fe22951429f628c1 GIT binary patch literal 2312 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 vsftpd.pem -echo 'DFC client' -#ganerate certificate&privatekey -openssl req -x509 -days 365 -newkey rsa:2048 -keyout dfc.key -out dfc.crt -subj "/C=PL/ST=Dolny Slask/L=Wroclaw/O=Root Company/OU=IT Department/CN=Nokia" -#create a jks keystore for TrustManager -keytool -keystore dfc.jks -genkey -alias dfc -storepass secret -keypass secret -dname "CN=root.com, OU=Root Org, O=Root Company, L=Wroclaw, ST=Dolny Slask, C=PL" -#import client.crt and client.key to p12 -openssl pkcs12 -export -in dfc.crt -inkey dfc.key \ - -out dfc.p12 -name dfc -#keystore -keytool -importkeystore \ - -deststorepass secret -destkeypass secret -destkeystore dfc.jks \ - -srckeystore dfc.p12 -srcstoretype PKCS12 -srcstorepass secret \ - -alias dfc -echo 'Finished' \ No newline at end of file +#generate keystore +openssl pkcs12 -export -out cert.pkcs12 -in vsftpd_crt.pem -inkey vsftpd_key.pem +java -cp ./jetty-6.1.26.jar org.mortbay.jetty.security.PKCS12Import cert.pkcs12 keystore.jks + +#generate truststore +openssl x509 -in vsftpd_crt.pem -out cert.der -outform der +keytool -importcert -alias cert -file cert.der -keystore truststore.jks + +sudo chown root * +sudo chmod 664 * + +echo "You have generated your key in the keystore, and your certificate in the truststore." + +##WITH PASSPHRASE +#echo 'Generating credetials for FTPES server and DFC client...' +# +##ganerate certificate&privatekey (vsftpd.crt, vsftpd.key) with password: secret +#openssl req -x509 -days 365 -newkey rsa:2048 -keyout vsftpd.key -out vsftpd.crt -subj "/C=PL/ST=Dolny Slask/L=Wroclaw/O=Root Company/OU=IT Department/CN=Nokia" --passout pass:secret +##convert crt to pem +#openssl x509 -in vsftpd.crt -out vsftpd_crt.pem -outform PEM +##convert key to pem +#openssl rsa -in vsftpd.key -out vsftpd_key.pem -outform PEM -passin pass:secret +##marge key and cert into one pem file +#cat vsftpd_key.pem vsftpd_crt.pem > vsftpd.pem +# +##generate keystore +#openssl pkcs12 -export -out cert.pkcs12 -in vsftpd_crt.pem -inkey vsftpd_key.pem -passout pass:secret +#java -cp ./jetty-6.1.26.jar org.mortbay.jetty.security.PKCS12Import cert.pkcs12 keystore.jks +# +##generate truststore +#openssl x509 -in vsftpd_crt.pem -out cert.der -outform der +#keytool -importcert -alias cert -file cert.der -keystore truststore.jks -storepass secret +# +#sudo chown root * +#sudo chmod 664 * +# +#echo "You have generated your key in the keystore, and your certificate in the truststore." \ No newline at end of file -- 2.16.6