diff --git a/WebServer/.gitignore b/WebServer/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..ae3c1726048cd06b9a143e0376ed46dd9b9a8d53
--- /dev/null
+++ b/WebServer/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/WebServer/Comandi usati per generare i certificati b/WebServer/Comandi usati per generare i certificati
new file mode 100644
index 0000000000000000000000000000000000000000..6080692a3b3e45cd1606f9c131e19844101f1d67
--- /dev/null
+++ b/WebServer/Comandi usati per generare i certificati
@@ -0,0 +1,23 @@
+Per prima cosa creo il file lig.keystore eseguendo sul terminale
+ ./gencert.bash
+
+Poi eseguo:
+ keytool -export -alias self_signed -keystore lig.keystore -rfc -file caWebServer.crt
+e ottengo quindi il certificato caWebServer.crt
+
+Poi converto il lig.keystore in pkcs eseguendo:
+ keytool -importkeystore -srckeystore lig.keystore -srcstorepass miapasswd -srckeypass miapasswd -srcalias self_signed -destalias self_signed -destkeystore identity.p12 -deststoretype PKCS12 -deststorepass miapasswd -destkeypass miapasswd
+ottengo quindi il file identity.p12
+
+Dal file identity.p12 ricavo la chiave privata eseguendo:
+ openssl pkcs12 -in identity.p12 -nodes -nocerts -out privateKeyCaWebServer.pem
+mi viene richiesta la password (che in questo caso è 'miapasswd'). Ottengo così il file privateKeyCaWebServer.pem
+
+
+Poi eseguo i comandi per ottenere i certificati del server, ovvero:
+ openssl genrsa -out server.key 2048
+
+ openssl req -out server.csr -key server.key -new
+
+ openssl x509 -req -in server.csr -CA caWebServer.crt -CAkey privateKeyCaWebServer.pem -CAcreateserial -out server.crt -days 400
+
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/README b/WebServer/Nuovi certificati creati il 16.09.2022/README
new file mode 100644
index 0000000000000000000000000000000000000000..1c5e5bb4d85cf21e0a8ccabc3209f3f83efe4ead
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/README
@@ -0,0 +1,9 @@
+Il file
+ caWebServer.crt
+va messo in /etc/mosquitto/ca_certificates
+
+
+
+I file
+ serverBB.crt serverBB.csr serverBB.key
+vanno messi in /etc/mosquitto/certs
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/caWebServer.crt b/WebServer/Nuovi certificati creati il 16.09.2022/caWebServer.crt
new file mode 100644
index 0000000000000000000000000000000000000000..99f7a8054a930e404103d25f1b33f7f5090dc54a
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/caWebServer.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIEaNTrtDANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJJ
+VDELMAkGA1UECBMCQUwxFDASBgNVBAcTC0FsZXNzYW5kcmlhMQ8wDQYDVQQKEwZV
+TklVUE8xDjAMBgNVBAsTBURJU0lUMRMwEQYDVQQDEwpsdWNpLmxvY2FsMB4XDTIy
+MDkxNTA4MzQxM1oXDTIyMTIxNDA4MzQxM1owZjELMAkGA1UEBhMCSVQxCzAJBgNV
+BAgTAkFMMRQwEgYDVQQHEwtBbGVzc2FuZHJpYTEPMA0GA1UEChMGVU5JVVBPMQ4w
+DAYDVQQLEwVESVNJVDETMBEGA1UEAxMKbHVjaS5sb2NhbDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAM7SNb/mB2M+N8X28Y/vkGSj5Tf6DM4nVc/clQvB
+JSHJ4aApojP7QwzmT7SrBeS+spHieivYNHjWRkfbOeCiVp4zSccUVdXpsJ9imDKM
+qpbhgIpflTuGNvKi+fPtQfybHO8W+Q3zkVNrRuKZTdj3F3VwJ1w+ruhOW7aCY8GP
+fJ8B8qaZKN93UOL587vMa+G2RSzfWvBe/ElFqsihpRiblFhe2pHLyvKBLXHqGdCk
+fd7tSIrgER6YvDLS5RoTMm78dcXAiDJUZ0/SJI39qMkYsWMuxhQ+mtCFAUV6xH2h
+JFes5PT3a3Nx079TZETlo6pbvN2BsTsxmwMUF/e8T2qm/XcCAwEAAaMhMB8wHQYD
+VR0OBBYEFONLShVX5L9oYr0l09dRZ/tc1LMnMA0GCSqGSIb3DQEBCwUAA4IBAQCe
+Ayn1sIMo91atjpcxuom1bYfJPJSx2uj2WIjHeBm5wjXYXs8QfkQ6Z9620sqIBFC/
+9wxA2z9qX25XpLSQOiGgrnY7j2bWgidYCtUjy8iBEqzA3USVCDuhYl6BxR+AtVRK
+Bo0DUB+NourfKi5xsdtSCZemCKqRmpbrmHeEX6Q3xKUb3U2B8mNpYe51P0hBtSeH
+BhKwFRtPXpsft8akTq9ixVHCj2nJhakvCeKUvQ7dyLThUXDov+zugLXb7HCXsYVh
+O8DrF4bwQkmMwEQqQ7hWKzXGmSdkVoVeY65bV4rajiuP7oawJ/BoVP4bXDaufgNv
+qArfSP2IJtWfaid4IuHe
+-----END CERTIFICATE-----
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/caWebServer.srl b/WebServer/Nuovi certificati creati il 16.09.2022/caWebServer.srl
new file mode 100644
index 0000000000000000000000000000000000000000..d408fb1ea3b8a6b1f8a1687b2f1d05e8081f7a8b
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/caWebServer.srl
@@ -0,0 +1 @@
+386729890C18383EFAFF3160BCA08520FA929AB5
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/identity.p12 b/WebServer/Nuovi certificati creati il 16.09.2022/identity.p12
new file mode 100644
index 0000000000000000000000000000000000000000..36c720df97487c26aed81a9f325dba508a9f22ec
Binary files /dev/null and b/WebServer/Nuovi certificati creati il 16.09.2022/identity.p12 differ
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/lig.keystore b/WebServer/Nuovi certificati creati il 16.09.2022/lig.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..f4002908743ea14dabcb17a46d6796de2ec83b76
Binary files /dev/null and b/WebServer/Nuovi certificati creati il 16.09.2022/lig.keystore differ
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/privateKeyCaWebServer.pem b/WebServer/Nuovi certificati creati il 16.09.2022/privateKeyCaWebServer.pem
new file mode 100644
index 0000000000000000000000000000000000000000..0c8552e2609ba943a1dc9083f398f0f999bd1e38
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/privateKeyCaWebServer.pem
@@ -0,0 +1,32 @@
+Bag Attributes
+ friendlyName: selfsigned
+ localKeyID: 54 69 6D 65 20 31 36 36 33 33 31 36 32 35 31 36 30 38
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDO0jW/5gdjPjfF
+9vGP75Bko+U3+gzOJ1XP3JULwSUhyeGgKaIz+0MM5k+0qwXkvrKR4nor2DR41kZH
+2zngolaeM0nHFFXV6bCfYpgyjKqW4YCKX5U7hjbyovnz7UH8mxzvFvkN85FTa0bi
+mU3Y9xd1cCdcPq7oTlu2gmPBj3yfAfKmmSjfd1Di+fO7zGvhtkUs31rwXvxJRarI
+oaUYm5RYXtqRy8rygS1x6hnQpH3e7UiK4BEemLwy0uUaEzJu/HXFwIgyVGdP0iSN
+/ajJGLFjLsYUPprQhQFFesR9oSRXrOT092tzcdO/U2RE5aOqW7zdgbE7MZsDFBf3
+vE9qpv13AgMBAAECggEBAKQ0j8pBVwI7hsqdSqMt4CWXXsk3tW0EHASBrLB9c/7E
+q2efRpIg3tZiEUxvMKmxolNjTf57lQWPkpNAgk5QdZb7P4tZIOFKvhl9jTstJc/P
+UGAMjY6J/Bxeuzco22g0ux80zR5/kJV7qfcFIqKtY6mxFv8NIY99jyFzmsI2KwqO
+ckHmTZkwD6FBmHJo8KNwIbBDHvuTtnCtXrCUDteAbcP2/p/XrOUovFLmj27Vneea
+g8sSyafyKt0gth+SA1rFB5VYwOQrjIdD3o2TgMGXGkBI4O6rmCZsBtSTsCtbJK1V
+hwp5W4EIe1ZuzCz/BvariquDCv2WbBEaCZbcea/yIVkCgYEA9PDGfl6vy1ZrbzVT
+xW7QmzIkk7sMV7ajUzguNgW/QqA6wx69HeZ6cDoSbl/TY9V0J8CrC3/P9gG5QOEA
+dHZz4RB+l0LUfGVJKzIndAa65cSNd/jFvDXN085p2NbTGT5rqn4535J+kYH2AUSH
+Inzq8O1NEhklLNJarwK0KZHUQFMCgYEA2CjRtYf6nIOK0H1GJEZZGuzEiIFEzEtp
+8BkOAIUAkrM7Z4SAg+Htl0MxgGJcmndnDh2hxiJsZylS5M5I8M9OrRvx+diQy2jg
+pgb7ZPbphduSrA5aW1wMmLteBbokxu4qMjuUtz8GViVxfJYSkfnIlOsORya5s/34
+MKxiKmGPOc0CgYEA2fD3HPARSUL+2ve/LxgX409tfklbhRxMHLsLWyQn9xds0bqj
+GVy/KuZxCeaXx+fgr5JeXx/9oW4NMO5DIl1XZDXx/ZMIUBsrTJUWx8VJPTJzkgE3
+p+zT1JeAVOFo+bgxwoUH56eImN3jT2NzPjuaLH9pKSZYjpYo/DnSpn5MNmMCgYEA
+gjdU3b6kwlSb8y0EbCXU19t6KaF2CHwFvZXaUYXN6pH+X0X7BXe84TqhP24ByyvS
+8TX4lpt2Ik9KmHuMhUTdaHtFMfW8hE0Rx/K8zv3Pf8ved7fNxuuUyw1Ufq68KPqg
+gNJTrHBTKOI1k4/0b+vBYbSYTVSO2ldMhEXUfSN4XKECgYA2DbTgUTtVFqr7SPSb
+MseNb78YDwdBiReMeqtgU6SkMSmqY3nlJu6p5O+n+RJecb/897uY2CWK3Z8kJVrS
+3QrseR24cZIXxiNtgAcgseasumzenvClsEY9nZKMMlquinnqsFWTWiNzj1Y0bmqy
+hbDLHeN3GxVab1PdVE1O7/ex2w==
+-----END PRIVATE KEY-----
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.crt b/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.crt
new file mode 100644
index 0000000000000000000000000000000000000000..4ccd7d2259190a0f5dfd51b749f86a0a166024f1
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmUCFDhnKYkMGDg++v8xYLyghSD6kpq1MA0GCSqGSIb3DQEBCwUAMGYx
+CzAJBgNVBAYTAklUMQswCQYDVQQIEwJBTDEUMBIGA1UEBxMLQWxlc3NhbmRyaWEx
+DzANBgNVBAoTBlVOSVVQTzEOMAwGA1UECxMFRElTSVQxEzARBgNVBAMTCmx1Y2ku
+bG9jYWwwHhcNMjIwOTE2MDgyODIwWhcNMjMxMDIxMDgyODIwWjCBjzELMAkGA1UE
+BhMCSVQxCzAJBgNVBAgMAkFMMRQwEgYDVQQHDAtBbGVzc2FuZHJpYTEMMAoGA1UE
+CgwDVVBPMQ4wDAYDVQQLDAVESVNJVDETMBEGA1UEAwwKbHVjaS5sb2NhbDEqMCgG
+CSqGSIb3DQEJARYbMjAwMzA3ODRAc3R1ZGVudGkudW5pdXBvLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxIKbHu8a8GSzN0UuhjaUzeWuphAtSzre
+Wk+Hw2ZaaPJExj74AMwTwGexQw+JU9zLCmTorzuGTkg/3AGt3+NlvUEb7W108l+u
+xCfS311jaEg3Ht56W4t9MhUE3rQXuB7/ZA8lYF/wyUwy75Y3vpDmf6WM0ZCyAJM7
+JyZeD9jYrjFDkq8j7ykecPuejR44ehU0WJV0/4WHCb8AwafZYUHjegzfAx9M2mXD
+dOZPUe9KG6SZzM0XgvLvo5TjNY6U0GJ8RbBPhvxsZMlMVvVf88FInq1PaC5Xfnh+
+0YJfyKUHXAyk1ILv5ovdwi6TlFtk8Ow/W5uzchdGUXIshChOpD1IhQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQA/hkS9gYK0XEnflakUQcscrC7pVKq+90lR5NKiQpq8
+EUm3as73z/lNJgqhVpkdAnLvvY0rWmoz7bseHN6GBIrkjAf4USUxf8S66BK1C4iS
+wVmjS5Ms/9+6LwiBu4tldcGP2YS3PiQ5hMLGDhKNEocyDHRzjCMwXeVsKrapMnia
+If/eaT0BqYcTD+AQ2WhlyfCH+zbG//wsaF7H4YG25n+eqvaIjXTL47DNfUdxIKpR
+rmLDUEnKnvj+shrVIVP0OaxVZR+2RHfR+fV7/D432F55Bq01oxypUkGUTezpdZJr
+ZEZWu6Dnz6kksVFD85x4jNE5e1WdPZyQxvD23eI59Iva
+-----END CERTIFICATE-----
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.csr b/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.csr
new file mode 100644
index 0000000000000000000000000000000000000000..3d70bc3a33b9d674e4b6f178dddef611ad2b22e0
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.csr
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC7jCCAdYCAQAwgY8xCzAJBgNVBAYTAklUMQswCQYDVQQIDAJBTDEUMBIGA1UE
+BwwLQWxlc3NhbmRyaWExDDAKBgNVBAoMA1VQTzEOMAwGA1UECwwFRElTSVQxEzAR
+BgNVBAMMCmx1Y2kubG9jYWwxKjAoBgkqhkiG9w0BCQEWGzIwMDMwNzg0QHN0dWRl
+bnRpLnVuaXVwby5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSC
+mx7vGvBkszdFLoY2lM3lrqYQLUs63lpPh8NmWmjyRMY++ADME8BnsUMPiVPcywpk
+6K87hk5IP9wBrd/jZb1BG+1tdPJfrsQn0t9dY2hINx7eeluLfTIVBN60F7ge/2QP
+JWBf8MlMMu+WN76Q5n+ljNGQsgCTOycmXg/Y2K4xQ5KvI+8pHnD7no0eOHoVNFiV
+dP+Fhwm/AMGn2WFB43oM3wMfTNplw3TmT1HvShukmczNF4Ly76OU4zWOlNBifEWw
+T4b8bGTJTFb1X/PBSJ6tT2guV354ftGCX8ilB1wMpNSC7+aL3cIuk5RbZPDsP1ub
+s3IXRlFyLIQoTqQ9SIUCAwEAAaAZMBcGCSqGSIb3DQEJBzEKDAhmdW56aW9uYTAN
+BgkqhkiG9w0BAQsFAAOCAQEAV5PLGIwdKsGFDH7AON/qCMWAAXRvx0oSkk5DfSFW
+L0XvnvIgh7MF+1ExYHHnxQHrfpuI7OEHV4mBaUtlfU0WIyZbLmsV2VouO8FLZmDf
+f2i7uzOLnuS0RvCj+H4KaXgZZwbzKK0c90b0OdbAae5XsKJBk2KaQtPOlF6uMTru
+TDR+tDY29WAAPq85U0GeHbSFBai2fefFlaLf0PMy9xpZZeO3qL2UmEzOJ0rxBlvU
+hDTU5Mz+Ao8PIevcsI9zhaBlmcckcV5tf3cEhq/xVfOpzlNtDyxA+r/qcHTaUnTv
+lSahcwwKYfHcqqy32swVhlfiPI3mIuia19XrukJ4nVEyDA==
+-----END CERTIFICATE REQUEST-----
diff --git a/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.key b/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.key
new file mode 100644
index 0000000000000000000000000000000000000000..ee604400f373549806b243d6ba6c52a0fffdff64
--- /dev/null
+++ b/WebServer/Nuovi certificati creati il 16.09.2022/serverBB.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAxIKbHu8a8GSzN0UuhjaUzeWuphAtSzreWk+Hw2ZaaPJExj74
+AMwTwGexQw+JU9zLCmTorzuGTkg/3AGt3+NlvUEb7W108l+uxCfS311jaEg3Ht56
+W4t9MhUE3rQXuB7/ZA8lYF/wyUwy75Y3vpDmf6WM0ZCyAJM7JyZeD9jYrjFDkq8j
+7ykecPuejR44ehU0WJV0/4WHCb8AwafZYUHjegzfAx9M2mXDdOZPUe9KG6SZzM0X
+gvLvo5TjNY6U0GJ8RbBPhvxsZMlMVvVf88FInq1PaC5Xfnh+0YJfyKUHXAyk1ILv
+5ovdwi6TlFtk8Ow/W5uzchdGUXIshChOpD1IhQIDAQABAoIBAFiawzLJgQ4Pebdc
+HEQr7CCChaMe/C1Fl+iEn6R9TBqx0kzJK63AVs+UcZrZMIR9s5c2NKx+XGqDrTeY
+Ejw3HjKdXuhJSEfY2MZdZnmMdDwbA6+JhQYt+P9R9uYrsd41K9aD9chkuf8punXI
+982XLDc2AC6l3Xzg5fUbGaJvlhPEG+iKLCu4QZuhEUN5XmB0AuInLeAsxUG8pCFd
+YunMAySAuT+hYeXXq1NgZfeQoyUq0ZRE7eAFjX3F4/0czM0M56paQbu7C2uy/2OI
+9TFhazLWY8ZhmnS/CPWFQ0HOnOhplt8zGyuEURVJLpB86ng/yUI+uzSjdZT/IQvx
+vCudCSkCgYEA8f8RyimsU8Hd/CVcQ7Zv4E6yUPALAnFekkrAckgckv7WBz+wKiQ4
+rrtnroBMDpHxP7izR5w37GjEO66OszW5ieM6KBcfk4TSk447XJrPyWInjnjtBlju
+Q3/EAWzCDkONxOdkKKmutWyipiC6RmGNAsTV6KVNGUeBBZwved43vLsCgYEAz+G0
+bGpuw1as1Ko79CjLgSNkNMlEB+Q7t7icRbeN9Wz9gumDL793hej0Wb7ikoTZdr6b
+bk9RkT5+X2NeiXuG0xlp1YjOYwfLPXLwleARY+STjsALrxsG8200TcSk5zA++wSm
+X23MbqYYcoFW1QQZT5iOrl9d4gumswi60YEjW78CgYAYuKzxkRZIrCpoQszNIgsF
+yCRRPmRxiHFX0okcY59/qMbmkKwHchHUT9LEsdiTOHeDwfOWoi/YV8+MJUXwqtFc
+c7kSNWKFaHE2n7YSvMHzWbKezF2yY01b2eaFGr4sRNxrvBOwT71ITWPEQt2kqPyF
+xuPvU0uwBGz6zLzQ31GkVwKBgQChwgtW4WrW7TcHNH/6eVQBZLywpnwdd+dQCoLv
+bOk1tF1/5JyEJwSmWqLowrQjNuTQlXj02RurXWmQaA5EBK7gzMGhuxZ90K7BXhL/
+TJ+7jz2SsrVkyC8cdDli2kVG8C/Ru8iKMTIGV5BmaWZb0xiu6xL7dJHlNxO79GsK
+YuZUmQKBgBnNnfCzr/1rLBg/ixHZvuE4M7YWk7/J0ng4ehuKWYs1+0k8iscvit3f
+owLIBPKxA1YTX4NzUU+eSKwMWge15Y6PhHdVxP1iuIJf5tmX8CdIUjzWl0p3OSE6
+DZXqvrP4nMoVCpYRJtiq3Uoajmmzz1bcqzx+96boxaecDiirTVfp
+-----END RSA PRIVATE KEY-----
diff --git a/WebServer/Prova_con_localhost_mio_pc/caWebServer.crt b/WebServer/Prova_con_localhost_mio_pc/caWebServer.crt
new file mode 100644
index 0000000000000000000000000000000000000000..51a9e4b31e2e3a2efcad608a091543026cd20edd
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/caWebServer.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDaTCCAlGgAwIBAgIEXZRgyDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJJ
+VDELMAkGA1UECBMCQUwxFDASBgNVBAcTC0FsZXNzYW5kcmlhMQ8wDQYDVQQKEwZV
+TklVUE8xDjAMBgNVBAsTBURJU0lUMRIwEAYDVQQDEwlsb2NhbGhvc3QwHhcNMjIw
+OTE2MDgzNjQzWhcNMjIxMjE1MDgzNjQzWjBlMQswCQYDVQQGEwJJVDELMAkGA1UE
+CBMCQUwxFDASBgNVBAcTC0FsZXNzYW5kcmlhMQ8wDQYDVQQKEwZVTklVUE8xDjAM
+BgNVBAsTBURJU0lUMRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDsmVZpyEvLYF1WuvFlWQHq3h+1ZkQf5/Tj24TOTNTA
+Wbp5yyuLypcFaOZ48ZLGo93WAKoKbDiXdx1jddJ8c2M0mipmf45QNj2vAC78LODt
+w/WjRJxrzrFqfJHPT6pfikdTD9OTGQlpkEcRYO6LFFngxYWxNyjZFXWWvE/s6u7L
+uHA5Su/XWk+UcDZG2hWNfmdN+xTVXQlymAZ1E1I5wDOXzlTURzkMWuYgELP/IrLZ
++I/kE/GlRZtFWlc9e/AnBs3z2VJeruuTsptMPlgjctN2pVuinXgrT4CADGzEnvYV
+7XAprVXLkq9E2EPE8jaxap5QJYnAaV+dqZIOP6txOB83AgMBAAGjITAfMB0GA1Ud
+DgQWBBTvDSABzho4OuNPqCXXZ+xF//scRTANBgkqhkiG9w0BAQsFAAOCAQEAmGa2
+5ygQuDe6ArM/XLRoKqELOVu0Z6+tebb472UZsou08Rg3X2tlaZ/QI1vIBAz2NY2D
+p+shLtPKYMy2nXHbKj3ls02htSVPX+NJMzk/IkCj05UN4WWVhmh24CXeGe4SfxTA
+BUiw65V3qw0hzFqv4Bo83DqQdKqEOBojixgti7guathpvdMSIWATzE07cOFw4w1s
+zxZslmorhVihIOXoO1f7I5ZtCzIxyejvFZqtg1jJ45Tz7h9eB7UK3rkj8l6VmjxO
+sYzbPHwer1bFtSRSk7Hx9MzVNsBseG5nJTVNB/nSJp3nsdNE/JjttXTk6sU9ho8k
+Ah0MLCZHkTaP8SSKkw==
+-----END CERTIFICATE-----
diff --git a/WebServer/Prova_con_localhost_mio_pc/caWebServer.srl b/WebServer/Prova_con_localhost_mio_pc/caWebServer.srl
new file mode 100644
index 0000000000000000000000000000000000000000..89f48897029ec0a6d190aad909cf56fe2e674dc7
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/caWebServer.srl
@@ -0,0 +1 @@
+3718D7FE9A4F78547B11C6B5FCF984FE8BDA3DD6
diff --git a/WebServer/Prova_con_localhost_mio_pc/gencert.bash b/WebServer/Prova_con_localhost_mio_pc/gencert.bash
new file mode 100755
index 0000000000000000000000000000000000000000..04edfc14bf0f2ae308545ba85781d5307aeda4aa
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/gencert.bash
@@ -0,0 +1 @@
+keytool -genkeypair -keyalg RSA -alias self_signed -keypass miapasswd -keystore lig.keystore -storepass miapasswd
diff --git a/WebServer/Prova_con_localhost_mio_pc/identity.p12 b/WebServer/Prova_con_localhost_mio_pc/identity.p12
new file mode 100644
index 0000000000000000000000000000000000000000..e888f313fd61fd440ca6bc2827978c2f58cbef74
Binary files /dev/null and b/WebServer/Prova_con_localhost_mio_pc/identity.p12 differ
diff --git a/WebServer/Prova_con_localhost_mio_pc/lig.keystore b/WebServer/Prova_con_localhost_mio_pc/lig.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..f0b2bf80721b8a882662db0a7efa389d8ab24c10
Binary files /dev/null and b/WebServer/Prova_con_localhost_mio_pc/lig.keystore differ
diff --git a/WebServer/Prova_con_localhost_mio_pc/privateKeyCaWebServer.pem b/WebServer/Prova_con_localhost_mio_pc/privateKeyCaWebServer.pem
new file mode 100644
index 0000000000000000000000000000000000000000..ca1815a18fb57ea2f033e24393a930aee23c8e81
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/privateKeyCaWebServer.pem
@@ -0,0 +1,32 @@
+Bag Attributes
+ friendlyName: self_signed
+ localKeyID: 54 69 6D 65 20 31 36 36 33 33 31 37 37 31 39 34 35 39
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDsmVZpyEvLYF1W
+uvFlWQHq3h+1ZkQf5/Tj24TOTNTAWbp5yyuLypcFaOZ48ZLGo93WAKoKbDiXdx1j
+ddJ8c2M0mipmf45QNj2vAC78LODtw/WjRJxrzrFqfJHPT6pfikdTD9OTGQlpkEcR
+YO6LFFngxYWxNyjZFXWWvE/s6u7LuHA5Su/XWk+UcDZG2hWNfmdN+xTVXQlymAZ1
+E1I5wDOXzlTURzkMWuYgELP/IrLZ+I/kE/GlRZtFWlc9e/AnBs3z2VJeruuTsptM
+PlgjctN2pVuinXgrT4CADGzEnvYV7XAprVXLkq9E2EPE8jaxap5QJYnAaV+dqZIO
+P6txOB83AgMBAAECggEBAIOLGU1E7EcNs7dlxpKXcwZ3Kt/7FMM8fp40zVi5xMuQ
+16mhePuGzoJWeVUi0n0YXF0AD4ot8yTbN/61YiqJKM31LL/CCYi1L4RdsMHJ3eCz
+w51bpzAVQfS3f4XogAwQYGlg8jvlfqMvcSPLZbTzwqjCiPsndNGFKdR9rF5HnC6s
+sgdm90YoRJZR7UPcmtFOShwXWNu0Kw/L5cHxv2lGDfo7ucCN4qz6yLwyrtMvk9m4
+sW58K1UyGAWpk0QLdggRL2eRbBIOEBRZTVSNcQjuDYT+xm162o4JpvNaV/3o2pe/
+7zk2yDjKCacIk9YkOvF3mVw0W9G6l5IY2bAXD2lMF6kCgYEA/YG0dxwawmdOlMjV
+WNQP5HIq6VITQTrZi2JPuwQUVzqHJclbvqdRK1OFKhHs15v10KwN0QncFa3z7DCn
+i12hBmSvz3HkdIu49r0QRrwPuWtBn8a2QQMDqMmKjdV7HXa9jjxaTJ9A5yM/N77D
+YFNAH3zb9rqwx2ZFNEzYXM/BL5sCgYEA7u0PtiZ8lF+mhSwyWBZIw/iockFp9HsP
+DI0YGhDEt2ZEJEUlOMRz170OpcVXz92FcLYFV32B3WNJCy92PXWev6ZeouAEWYxD
+AjxTdI6FNX56QXI9ZNx1Qowugcp+kS+eyQ35LCaT2Xo9tk+hZl8MJSKRnCQpPNAE
+pBA2yITt3pUCgYA0SiK9RtDGNKTiz6IiFmvIxTvQsJtEIy1oMLkdbDP94haqVqRT
+6RM3Cp03FkdyGbtUdYjMC2qYFi9wEoEcoA1s0ivpcCadW4ylaE4JKRVdO6BnoodJ
+VaPVluy7YMNqSmnDAvPlRhwPERgjGXgXUFSzqf99HvkDyDaSGR+v1TKV7QKBgDkq
+7cR2pv5VeKGKtq0O//AsEhnsfu6pdytYozixZHBBfvJyvPo9Pz6SlOujMWSiK2iR
+lOufMzCGrhaID7Ga8BYJN8Ge+kt23R2u04UjCMqI7bW1IO1+Nmxq4EHb8rbIfyS6
+PDGNNXkm35c8rHCzM1O7Vr3WhStw1ntvCbym2ceVAoGBAPXn98sgCJOo/HOl/OZx
+zJV0js9j94zGJJ+8fdrBC6r2NbDxH+GK8NoZ07j30z9ElTe8dBv2Mp1qaikUZzd0
+LiKm+uw6d2iYC+PpTvww+SQAPWoKgVQ1dmvX7We/E6SdxJI6IBkpKDBSFWifToSR
+BbMwbeGImrMDmUIYFJ8o2VjC
+-----END PRIVATE KEY-----
diff --git a/WebServer/Prova_con_localhost_mio_pc/serverBB.crt b/WebServer/Prova_con_localhost_mio_pc/serverBB.crt
new file mode 100644
index 0000000000000000000000000000000000000000..92b1bdd64216ef57b8b62dcd0e9e4c90b99ba1a9
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/serverBB.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmMCFDcY1/6aT3hUexHGtfz5hP6L2j3WMA0GCSqGSIb3DQEBCwUAMGUx
+CzAJBgNVBAYTAklUMQswCQYDVQQIEwJBTDEUMBIGA1UEBxMLQWxlc3NhbmRyaWEx
+DzANBgNVBAoTBlVOSVVQTzEOMAwGA1UECxMFRElTSVQxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAeFw0yMjA5MTYwODUwNTdaFw0yMzEwMjEwODUwNTdaMIGOMQswCQYDVQQG
+EwJJVDELMAkGA1UECAwCQUwxFDASBgNVBAcMC0FsZXNzYW5kcmlhMQwwCgYDVQQK
+DANVUE8xDjAMBgNVBAsMBURJU0lUMRIwEAYDVQQDDAlsb2NhbGhvc3QxKjAoBgkq
+hkiG9w0BCQEWGzIwMDMwNzg0QHN0dWRlbnRpLnVuaXVwby5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKZuoy82auYfiexk8UO3m2ZBTkCZ+8xGzoWD
+qjUBzHm3gMXaTFnZeHlNwg4kLNtOF/iRY/Wr5/E/FPY4xL54lm6S5dspobqeQjyA
+hez83HxqQy5MYUJ8L4w/YXBrYEjim96K4xSIscSRxOKCmhD782o0NMQDeDJviqBU
+QTJlMEQg8b885+eCTuhRYV+b8GpMg23syx/1I9XI2EfREesili5CSmeOKMKVpN1Q
+5cKR+ZMLtuYLe75HwCzv5Y8gFGEkL/pdlrbbnRvXPN6eZhazZdyc4AkvfwAh6Lw/
+KV7P67wSd2HK0l7lv+S8wACqdygDbGuliS2Edtnxb5PVFCle2mcCAwEAATANBgkq
+hkiG9w0BAQsFAAOCAQEAoqecuy28IvFwL+ZUoK8hmOeEQ3JKdzQ01Lf9yXZTFI+q
++HoSbyjCI5Ei3nqc2HjGYG4JEMZ/YonZhb6JerZ1IY4bRItBAdruvEZFFoj5iVwT
+Qd7+7+k823kzuhFPv77a/DMh5xrqhF/U3LKVC58llFqYfGldYgSEBqsDofssvq8j
+/uG/EfEhx+X9VWbCaChKBe8EuGoITtC6psWp1r3OJqWML9+q+5H6h9ns4njw1VKj
++9zZQBh9KU4UH6OYVaE61vv5MWkZ8V3+gUQEv8NHVlhzSvddN71gHXN/ZGuHHmXS
+V5sargvuBUe/gmd19bg12NJ1BH8uoZuHoyg1EJ53Ug==
+-----END CERTIFICATE-----
diff --git a/WebServer/Prova_con_localhost_mio_pc/serverBB.csr b/WebServer/Prova_con_localhost_mio_pc/serverBB.csr
new file mode 100644
index 0000000000000000000000000000000000000000..1ba3b780adae256b02f92922bb9ecbf2d365cbf3
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/serverBB.csr
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC7TCCAdUCAQAwgY4xCzAJBgNVBAYTAklUMQswCQYDVQQIDAJBTDEUMBIGA1UE
+BwwLQWxlc3NhbmRyaWExDDAKBgNVBAoMA1VQTzEOMAwGA1UECwwFRElTSVQxEjAQ
+BgNVBAMMCWxvY2FsaG9zdDEqMCgGCSqGSIb3DQEJARYbMjAwMzA3ODRAc3R1ZGVu
+dGkudW5pdXBvLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApm6j
+LzZq5h+J7GTxQ7ebZkFOQJn7zEbOhYOqNQHMebeAxdpMWdl4eU3CDiQs204X+JFj
+9avn8T8U9jjEvniWbpLl2ymhup5CPICF7PzcfGpDLkxhQnwvjD9hcGtgSOKb3orj
+FIixxJHE4oKaEPvzajQ0xAN4Mm+KoFRBMmUwRCDxvzzn54JO6FFhX5vwakyDbezL
+H/Uj1cjYR9ER6yKWLkJKZ44owpWk3VDlwpH5kwu25gt7vkfALO/ljyAUYSQv+l2W
+ttudG9c83p5mFrNl3JzgCS9/ACHovD8pXs/rvBJ3YcrSXuW/5LzAAKp3KANsa6WJ
+LYR22fFvk9UUKV7aZwIDAQABoBkwFwYJKoZIhvcNAQkHMQoMCGZ1bnppb25hMA0G
+CSqGSIb3DQEBCwUAA4IBAQA5u9OxtFGPSrRdT6eBmUpzm13RPWbCu5GujVa+plQ3
+E3Fr6gm2Dfw8soq05bKCIG6L6Hs+qcb++KAs3gUzSXnqt5azWSxTcYj2y1mnrIOn
+whTy1mdCSOlaeLlQUrk/hjiTjnDg2pWiGfIY3rlg68K3JfVeul53RGZqY2jRfbSS
+lQW8KTUPmt2h8NDCEtDuVkhf+morsjbvDYta0Tt5ORtVNthxq5jIv8EXOki3af+2
+llLV193GXojaRo/apkQp/vuXxYnXGcPu1XF5t3xqNatsuQ+6A12PWiey4T9HmRWx
+qQycQ0a+0lPdRvEh6NtJhjoR5y/9FI1enLtp9jsWF9hq
+-----END CERTIFICATE REQUEST-----
diff --git a/WebServer/Prova_con_localhost_mio_pc/serverBB.key b/WebServer/Prova_con_localhost_mio_pc/serverBB.key
new file mode 100644
index 0000000000000000000000000000000000000000..4c3e4dcd6daa9294beca671161959e1a5083075a
--- /dev/null
+++ b/WebServer/Prova_con_localhost_mio_pc/serverBB.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApm6jLzZq5h+J7GTxQ7ebZkFOQJn7zEbOhYOqNQHMebeAxdpM
+Wdl4eU3CDiQs204X+JFj9avn8T8U9jjEvniWbpLl2ymhup5CPICF7PzcfGpDLkxh
+QnwvjD9hcGtgSOKb3orjFIixxJHE4oKaEPvzajQ0xAN4Mm+KoFRBMmUwRCDxvzzn
+54JO6FFhX5vwakyDbezLH/Uj1cjYR9ER6yKWLkJKZ44owpWk3VDlwpH5kwu25gt7
+vkfALO/ljyAUYSQv+l2WttudG9c83p5mFrNl3JzgCS9/ACHovD8pXs/rvBJ3YcrS
+XuW/5LzAAKp3KANsa6WJLYR22fFvk9UUKV7aZwIDAQABAoIBAAh0PEPMrtdrqLTi
+V8MJ05H5JUFw0PKKcjkj/ARfSASyxo7GTPSPcGgxA/d17PVi3SLaN8ql5c1CWA09
+yvil5XZObfCZB8cT/OdX2/WyznxfZXQ3mwUmi7/DBG8SdTyeji5avbgwTV9fzDF5
+UtwkADRX3IpMZtGhCtikDv/BVhdPxBH6JZl9/QX8YsxrIbzoRFln6W3STPUb97lf
+/Vre82cK1lsQtVe8woSxXh1AZagwYd2E1CvBt5p3/0DKz6813oLb4FZVGjpZdKGI
+frwVz39e1xmxPWIo2n7WIjbn/XVZJFD/d/m0HSbXCuPpCCgdwJQvtOmMO0EJwYe0
+JfOp4VkCgYEA3ZryndhLzzArHhCTBRHrsDsElzGIPq7nzjiAzcVWElILD7XPTwfp
+zm7hqLX9xsMAhIxtvNNkGKFU/g+FUpAo6vgVfa4G5X/Ia5UH9yN2WEA/dxXTUHzY
+hLNMl/jEZ24Ei+Pn9fyNKjvl89xYqKJNYQi4qIPaB/9i9rkdr86SESMCgYEAwEN+
+sNNW6Tpi9B3mr9JXWLjsce7oVinOmJsjwwsXUVZkL2XDbuF/clmGyOHv3sr3HyH2
+0d3m20ji+x/IPsbxI+LMvDM+8ywdqSWDCLSZmI4cxxy0w762TsHrpJ7bu+CoDZ/k
+elLOLQCRJZSFyTRvUeiONMWRw2xH/O7jjyAjX+0CgYBX8V3G9kdfeaYi0EEICgyW
+a1VvCuEevxqO5C15e46kxppNKcGTg3hty+MRqOeFMW3LLE+AWAOpIp0wFci68yrJ
+1JnyvlVOTl+jEgmPMiuM6jJFeAvcLS9fuifzR23p/ecf/NnY7Ni4ofynwhINGhvL
+HkLp3SlxcxA7CUuWsUuWMQKBgQCFXgyC8ocmT/cWaat9KUan59c0jUojguqp12wu
+PwJUzL3AVzIDN28lzk5+CKRRAq/7q57AI9KhKGUzV++bBHt/rjLhFhdDrcWBcOD9
+Z/Hn7iSuRg5qfl+OMFyanAvGvuc0VEa0R753Xx5QWD+Zu8LAqbYDi006p2EkZj36
+KYwAXQKBgBlsX4oUKuLCEIGjKUHayjuGUNIJTRy986KtlFCXe5581ZjuqmcTMPuG
+Lzuk7J3CFgFTqTjZcnoqAda+cI7X4LjjN+0oSjEjNRdhO73NfswAn6Tp1JwLILhD
+mGPtD2xKAv0riECiIhA6vGuqsTkb4GUStW/g3WWBuOMSro+HcMDY
+-----END RSA PRIVATE KEY-----
diff --git a/WebServer/bin/code/Antifurto.class b/WebServer/bin/code/Antifurto.class
deleted file mode 100644
index f871b0867c473ce9730206f1a112d9068e1b7959..0000000000000000000000000000000000000000
Binary files a/WebServer/bin/code/Antifurto.class and /dev/null differ
diff --git a/WebServer/bin/code/Helper.class b/WebServer/bin/code/Helper.class
index fd368eccee95c1bbfcac603f3257e5525f2ddb3b..ce914f230c7750f15c0670385db5f7929f75d735 100644
Binary files a/WebServer/bin/code/Helper.class and b/WebServer/bin/code/Helper.class differ
diff --git a/WebServer/bin/code/Home.class b/WebServer/bin/code/Home.class
index f3684190f0f55f28da72773e5c8c571f7d4ed731..2733f00b4f5d39221cff62d65ae012dc4eb98e4b 100644
Binary files a/WebServer/bin/code/Home.class and b/WebServer/bin/code/Home.class differ
diff --git a/WebServer/bin/code/ImageRes.class b/WebServer/bin/code/ImageRes.class
index c13d555803e889f009199779747dd92ec6f25b9e..150373c0045915c51478faa4d3e70ae7b72c3718 100644
Binary files a/WebServer/bin/code/ImageRes.class and b/WebServer/bin/code/ImageRes.class differ
diff --git a/WebServer/bin/code/KeyCloak.class b/WebServer/bin/code/KeyCloak.class
index 6f98feed0e88e3ed476034a0abdd62e15c8380dc..ac80762a67322baa33ffd5d0ec18bd53a216d938 100644
Binary files a/WebServer/bin/code/KeyCloak.class and b/WebServer/bin/code/KeyCloak.class differ
diff --git a/WebServer/bin/code/Luci.class b/WebServer/bin/code/Luci.class
deleted file mode 100644
index 66ed0d2ba7c80cf7a72091952eb6039a0ffbd35a..0000000000000000000000000000000000000000
Binary files a/WebServer/bin/code/Luci.class and /dev/null differ
diff --git a/WebServer/bin/code/MissingPage.class b/WebServer/bin/code/MissingPage.class
deleted file mode 100644
index 75b596d29b9aab57513af13b34ed5b4e6036b8e5..0000000000000000000000000000000000000000
Binary files a/WebServer/bin/code/MissingPage.class and /dev/null differ
diff --git a/WebServer/bin/code/ObtainToken.class b/WebServer/bin/code/ObtainToken.class
index f258decf5d5f4e59bd514dc2d781544c5545e6f0..317836b60d3e6f4c3c7be5251836eef98e4f1032 100644
Binary files a/WebServer/bin/code/ObtainToken.class and b/WebServer/bin/code/ObtainToken.class differ
diff --git a/WebServer/bin/code/Resources.class b/WebServer/bin/code/Resources.class
index 44be854e054a76e300164cafb98b46eb4538e98b..0ed8bfcc6e19f83181937a9d3a690bd00dabd8f5 100644
Binary files a/WebServer/bin/code/Resources.class and b/WebServer/bin/code/Resources.class differ
diff --git a/WebServer/bin/code/Server$1.class b/WebServer/bin/code/Server$1.class
index 38daa28edacff85231424be273ee315ca437e914..2dec674c58cae17da6123e7f4f862649fc1eded7 100644
Binary files a/WebServer/bin/code/Server$1.class and b/WebServer/bin/code/Server$1.class differ
diff --git a/WebServer/bin/code/Server.class b/WebServer/bin/code/Server.class
index ab3199cc984e3081670a07b24a4cff0f4914811a..7713be4d7286765018a9a0a81fcd75d0c249b7cc 100644
Binary files a/WebServer/bin/code/Server.class and b/WebServer/bin/code/Server.class differ
diff --git a/WebServer/cert.pem b/WebServer/cert.pem
index c2b2907814c0b83892535fe2e9802b2066f6c715..ee869a1845c69e47674c63042d99635347370c91 100644
--- a/WebServer/cert.pem
+++ b/WebServer/cert.pem
@@ -1,23 +1,28 @@
+Bag Attributes
+ friendlyName: self_signed
+ localKeyID: 54 69 6D 65 20 31 36 36 33 32 35 35 33 34 37 39 36 36
+subject=C = IT, ST = AL, L = Alessandria, O = UNIUPO, OU = DISIT, CN = luci.local
+
+issuer=C = IT, ST = AL, L = Alessandria, O = UNIUPO, OU = DISIT, CN = luci.local
+
-----BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
-EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
-ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
-NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
-EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
-AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
-E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
-/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
-DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
-GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
-tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
-AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
-WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
-9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
-gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
-2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
-4uJEvlz36hz1
+MIIDazCCAlOgAwIBAgIEaNTrtDANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJJ
+VDELMAkGA1UECBMCQUwxFDASBgNVBAcTC0FsZXNzYW5kcmlhMQ8wDQYDVQQKEwZV
+TklVUE8xDjAMBgNVBAsTBURJU0lUMRMwEQYDVQQDEwpsdWNpLmxvY2FsMB4XDTIy
+MDkxNTA4MzQxM1oXDTIyMTIxNDA4MzQxM1owZjELMAkGA1UEBhMCSVQxCzAJBgNV
+BAgTAkFMMRQwEgYDVQQHEwtBbGVzc2FuZHJpYTEPMA0GA1UEChMGVU5JVVBPMQ4w
+DAYDVQQLEwVESVNJVDETMBEGA1UEAxMKbHVjaS5sb2NhbDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAM7SNb/mB2M+N8X28Y/vkGSj5Tf6DM4nVc/clQvB
+JSHJ4aApojP7QwzmT7SrBeS+spHieivYNHjWRkfbOeCiVp4zSccUVdXpsJ9imDKM
+qpbhgIpflTuGNvKi+fPtQfybHO8W+Q3zkVNrRuKZTdj3F3VwJ1w+ruhOW7aCY8GP
+fJ8B8qaZKN93UOL587vMa+G2RSzfWvBe/ElFqsihpRiblFhe2pHLyvKBLXHqGdCk
+fd7tSIrgER6YvDLS5RoTMm78dcXAiDJUZ0/SJI39qMkYsWMuxhQ+mtCFAUV6xH2h
+JFes5PT3a3Nx079TZETlo6pbvN2BsTsxmwMUF/e8T2qm/XcCAwEAAaMhMB8wHQYD
+VR0OBBYEFONLShVX5L9oYr0l09dRZ/tc1LMnMA0GCSqGSIb3DQEBCwUAA4IBAQCe
+Ayn1sIMo91atjpcxuom1bYfJPJSx2uj2WIjHeBm5wjXYXs8QfkQ6Z9620sqIBFC/
+9wxA2z9qX25XpLSQOiGgrnY7j2bWgidYCtUjy8iBEqzA3USVCDuhYl6BxR+AtVRK
+Bo0DUB+NourfKi5xsdtSCZemCKqRmpbrmHeEX6Q3xKUb3U2B8mNpYe51P0hBtSeH
+BhKwFRtPXpsft8akTq9ixVHCj2nJhakvCeKUvQ7dyLThUXDov+zugLXb7HCXsYVh
+O8DrF4bwQkmMwEQqQ7hWKzXGmSdkVoVeY65bV4rajiuP7oawJ/BoVP4bXDaufgNv
+qArfSP2IJtWfaid4IuHe
-----END CERTIFICATE-----
diff --git a/WebServer/key.pem b/WebServer/key.pem
new file mode 100644
index 0000000000000000000000000000000000000000..8a9271037a4b4319be2dbee02f525acb4ef4a249
--- /dev/null
+++ b/WebServer/key.pem
@@ -0,0 +1,32 @@
+Bag Attributes
+ friendlyName: self_signed
+ localKeyID: 54 69 6D 65 20 31 36 36 33 32 35 35 33 34 37 39 36 36
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDO0jW/5gdjPjfF
+9vGP75Bko+U3+gzOJ1XP3JULwSUhyeGgKaIz+0MM5k+0qwXkvrKR4nor2DR41kZH
+2zngolaeM0nHFFXV6bCfYpgyjKqW4YCKX5U7hjbyovnz7UH8mxzvFvkN85FTa0bi
+mU3Y9xd1cCdcPq7oTlu2gmPBj3yfAfKmmSjfd1Di+fO7zGvhtkUs31rwXvxJRarI
+oaUYm5RYXtqRy8rygS1x6hnQpH3e7UiK4BEemLwy0uUaEzJu/HXFwIgyVGdP0iSN
+/ajJGLFjLsYUPprQhQFFesR9oSRXrOT092tzcdO/U2RE5aOqW7zdgbE7MZsDFBf3
+vE9qpv13AgMBAAECggEBAKQ0j8pBVwI7hsqdSqMt4CWXXsk3tW0EHASBrLB9c/7E
+q2efRpIg3tZiEUxvMKmxolNjTf57lQWPkpNAgk5QdZb7P4tZIOFKvhl9jTstJc/P
+UGAMjY6J/Bxeuzco22g0ux80zR5/kJV7qfcFIqKtY6mxFv8NIY99jyFzmsI2KwqO
+ckHmTZkwD6FBmHJo8KNwIbBDHvuTtnCtXrCUDteAbcP2/p/XrOUovFLmj27Vneea
+g8sSyafyKt0gth+SA1rFB5VYwOQrjIdD3o2TgMGXGkBI4O6rmCZsBtSTsCtbJK1V
+hwp5W4EIe1ZuzCz/BvariquDCv2WbBEaCZbcea/yIVkCgYEA9PDGfl6vy1ZrbzVT
+xW7QmzIkk7sMV7ajUzguNgW/QqA6wx69HeZ6cDoSbl/TY9V0J8CrC3/P9gG5QOEA
+dHZz4RB+l0LUfGVJKzIndAa65cSNd/jFvDXN085p2NbTGT5rqn4535J+kYH2AUSH
+Inzq8O1NEhklLNJarwK0KZHUQFMCgYEA2CjRtYf6nIOK0H1GJEZZGuzEiIFEzEtp
+8BkOAIUAkrM7Z4SAg+Htl0MxgGJcmndnDh2hxiJsZylS5M5I8M9OrRvx+diQy2jg
+pgb7ZPbphduSrA5aW1wMmLteBbokxu4qMjuUtz8GViVxfJYSkfnIlOsORya5s/34
+MKxiKmGPOc0CgYEA2fD3HPARSUL+2ve/LxgX409tfklbhRxMHLsLWyQn9xds0bqj
+GVy/KuZxCeaXx+fgr5JeXx/9oW4NMO5DIl1XZDXx/ZMIUBsrTJUWx8VJPTJzkgE3
+p+zT1JeAVOFo+bgxwoUH56eImN3jT2NzPjuaLH9pKSZYjpYo/DnSpn5MNmMCgYEA
+gjdU3b6kwlSb8y0EbCXU19t6KaF2CHwFvZXaUYXN6pH+X0X7BXe84TqhP24ByyvS
+8TX4lpt2Ik9KmHuMhUTdaHtFMfW8hE0Rx/K8zv3Pf8ved7fNxuuUyw1Ufq68KPqg
+gNJTrHBTKOI1k4/0b+vBYbSYTVSO2ldMhEXUfSN4XKECgYA2DbTgUTtVFqr7SPSb
+MseNb78YDwdBiReMeqtgU6SkMSmqY3nlJu6p5O+n+RJecb/897uY2CWK3Z8kJVrS
+3QrseR24cZIXxiNtgAcgseasumzenvClsEY9nZKMMlquinnqsFWTWiNzj1Y0bmqy
+hbDLHeN3GxVab1PdVE1O7/ex2w==
+-----END PRIVATE KEY-----
diff --git a/WebServer/prova.p12 b/WebServer/prova.p12
new file mode 100644
index 0000000000000000000000000000000000000000..2e795916cc6da309f237107b77ce33c5aeeac4eb
Binary files /dev/null and b/WebServer/prova.p12 differ
diff --git a/WebServer/public/js/authentication/app.js b/WebServer/public/js/authentication/app.js
index 8286eab07b6e4e292c0f446f3da2212e3cabe370..12dd900320fd39268bf3b9ecdc386ff2bdeef3af 100644
--- a/WebServer/public/js/authentication/app.js
+++ b/WebServer/public/js/authentication/app.js
@@ -136,24 +136,11 @@ class App {
topicsArr.push({role:"U", topic: `to/${domainName}/luci/${c.value}/#`});
topicsArr.push({role:"U", topic: `from/${domainName}/luci/${c.value}/#`});
topicsArr.push({role:"U", topic: `rpc/${domainName}/luci/${c.value}/#`});
-
- // DA FARE: cancella i commenti qui sotto
- // DOMANDA: E se il sottodominio fosse dove viene pubblicato il messaggio, ovvero CLOUD o BB ? PER ORA PENSIAMO DI NO.
- // Noi finora stiamo usando sempre lo stesso sottodominio, giusto? SI Cioè usiamo sempre e solo 'luci'? SI
- // Devo aggiungere anche :
- /*
- topicsArr.push({role:"U", topic: `to/${domainName}/cloud/${c.value}/#`});
- topicsArr.push({role:"U", topic: `from/${domainName}/cloud/${c.value}/#`});
- topicsArr.push({role:"U", topic: `rpc/${domainName}/cloud/${c.value}/#`});
- */
- // ? RISPOSTA: per ora pensiamo di NO.
-
- // to/all NON LO USIAMO (OGNI MICROSERVIZIO SOTTOSCRIVE to/all e INVIA DI CONSEGUENZA UNA RISPOSTA, MA NESSUNO LA LEGGE).
- // Secondo me to/all non è da consentire nè a un amministratore nè a un utente normale!
- }
+ }
}
- const checkboxDiv = document.getElementById('checkbox-div');
+ const checkboxDiv = document.getElementById('checkbox-div');
+
if(checks.length === 0){
errors++;
checkboxDiv.classList.add('is-invalid');
@@ -161,11 +148,19 @@ class App {
document.getElementById('valid-services').innerHTML = '';
document.getElementById('invalid-services').innerHTML = 'Selezionare almeno un servizio';
}
- else {
- checkboxDiv.classList.add('is-valid');
- checkboxDiv.classList.remove('is-invalid');
- document.getElementById('valid-services').innerHTML = 'Ok';
- document.getElementById('invalid-services').innerHTML = '';
+ else {
+ if(checks.includes('Scenari') && !checks.includes('Luci')) {
+ errors++;
+ checkboxDiv.classList.add('is-invalid');
+ checkboxDiv.classList.remove('is-valid');
+ document.getElementById('valid-services').innerHTML = '';
+ document.getElementById('invalid-services').innerHTML = 'Non e\' possibile avere il microservizio degli scenari senza il microservizio delle luci';
+ } else {
+ checkboxDiv.classList.add('is-valid');
+ checkboxDiv.classList.remove('is-invalid');
+ document.getElementById('valid-services').innerHTML = 'Ok';
+ document.getElementById('invalid-services').innerHTML = '';
+ }
}
let i=0;
@@ -227,6 +222,7 @@ class App {
});
i++;
}
+
if(errors > 0) {
return;
}
diff --git a/WebServer/serverBB.crt b/WebServer/serverBB.crt
new file mode 100644
index 0000000000000000000000000000000000000000..282c904248e44721e5a92208f0c0ab06832d18ee
--- /dev/null
+++ b/WebServer/serverBB.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmUCFDoTigLPBLlWFGztuqJj8NyillT6MA0GCSqGSIb3DQEBCwUAMGYx
+CzAJBgNVBAYTAklUMQswCQYDVQQIEwJBTDEUMBIGA1UEBxMLQWxlc3NhbmRyaWEx
+DzANBgNVBAoTBlVOSVVQTzEOMAwGA1UECxMFRElTSVQxEzARBgNVBAMTCmx1Y2ku
+bG9jYWwwHhcNMjIwOTE1MTUzMDQ2WhcNMjMxMDIwMTUzMDQ2WjCBjzELMAkGA1UE
+BhMCSVQxCzAJBgNVBAgMAkFMMRQwEgYDVQQHDAtBbGVzc2FuZHJpYTEMMAoGA1UE
+CgwDVVBPMQ4wDAYDVQQLDAVESVNJVDETMBEGA1UEAwwKbHVjaS5sb2NhbDEqMCgG
+CSqGSIb3DQEJARYbMjAwMzA3ODRAc3R1ZGVudGkudW5pdXBvLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAus8Cd8Sbi0INrTFZpa0C8YfC+XDujcxb
+b4SbSjCiF2LsrP/Uhtx8vZGveJCXKzVctiu2ONDnTp/1c4d39w2ENAJfNcqXQbm0
+c3czKPQQC+keEBkuMQybeNk4Am4cGKBeF4YhWVYm6qfhcnTBdjcnU+TkqH/q9F0p
+YnwWgNTupgfVuPrmMa1/lKe1sgJcMzGvzp9w9sT8dh/zrmIW9gOUDM4/WitHYV77
+RlXb9uQLBrZAh8r0kodz5Q5njqciyGo3TCMmtWsEwevy2+WpcN2w4SqQvPUjAUni
+Dxz0MYIBQgVwK2ZaK3gyyX7Oc8rFg1g6GXZAFdFlv6fdJcrqYrW8FwIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQBKTmWIa5veFkg2vvwedSc/n9xY/8CtEpTpPMtlqA7e
+1wgT8Z8MiPWGoZOYxYvkrCmkDYDS51sypPDiPD23CIgrCMqDw+ujT2kDySAGbmry
+USyWCPoEz+gK/u1+REYKgAmZh/p/7DPxi8GJjaqEXE4l63hA4GsHZyS5yv9mSVgy
+8xXHVN7PMnGZl5P1Znhbk8cC+ZX2WZtHNWVcsm0mInfIlQKNYp7Z30rzDKs5J79F
+OrjnI83DMmQZZ18BBi/6E0ZUTHpyj82bfCWtItHrAYc+2ANUai9LcOjNY31yMytg
+lX+IY3RYFHqCrlKAfnOSLONSIpnuvtaUk4vb2Le1U/qf
+-----END CERTIFICATE-----
diff --git a/WebServer/serverWeb.csr b/WebServer/serverWeb.csr
new file mode 100644
index 0000000000000000000000000000000000000000..ef0c467df546ccde7a95f73aa323a373810ff869
--- /dev/null
+++ b/WebServer/serverWeb.csr
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC7jCCAdYCAQAwgY8xCzAJBgNVBAYTAklUMQswCQYDVQQIDAJBTDEUMBIGA1UE
+BwwLQWxlc3NhbmRyaWExDDAKBgNVBAoMA1VQTzEOMAwGA1UECwwFRElTSVQxEzAR
+BgNVBAMMCmx1Y2kubG9jYWwxKjAoBgkqhkiG9w0BCQEWGzIwMDMwNzg0QHN0dWRl
+bnRpLnVuaXVwby5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrP
+AnfEm4tCDa0xWaWtAvGHwvlw7o3MW2+Em0owohdi7Kz/1IbcfL2Rr3iQlys1XLYr
+tjjQ506f9XOHd/cNhDQCXzXKl0G5tHN3Myj0EAvpHhAZLjEMm3jZOAJuHBigXheG
+IVlWJuqn4XJ0wXY3J1Pk5Kh/6vRdKWJ8FoDU7qYH1bj65jGtf5SntbICXDMxr86f
+cPbE/HYf865iFvYDlAzOP1orR2Fe+0ZV2/bkCwa2QIfK9JKHc+UOZ46nIshqN0wj
+JrVrBMHr8tvlqXDdsOEqkLz1IwFJ4g8c9DGCAUIFcCtmWit4Msl+znPKxYNYOhl2
+QBXRZb+n3SXK6mK1vBcCAwEAAaAZMBcGCSqGSIb3DQEJBzEKDAhmdW56aW9uYTAN
+BgkqhkiG9w0BAQsFAAOCAQEAg9aJhiHBR8l73wZCcezDbOEs6TlwQPFXy8Ke+6Y/
+9W0zlH7Uy4OFaDrnQCnitK/6KgcChKWcDheYWh4PCl6CyqQXrzv8k6rChKuTg7Fc
+pMAhmg72lfgOfmrgnOH3gyfmdfsrl5ZTrxuCFW6QUaPKDbsOMZ8cVACWlZPuyAbV
+bcwi3BG2RNuo87VCGg4Tq1XDwUHqHy0EP3cEb93jMTWVGxoQeoVkg8qp2PmySqSh
+EQyLzvzeZsCJV8kFdKD4IEArxKbxwoOyN3X2enDgVRmSExRjUHb3qy+y2kadnwla
+eA551vVRjig7Ee+7VbkTGrfoXbUlXkjS3xfLU6apvenhGA==
+-----END CERTIFICATE REQUEST-----
diff --git a/WebServer/serverWeb.key b/WebServer/serverWeb.key
new file mode 100644
index 0000000000000000000000000000000000000000..96fef3727658acf4990f1ac602f737b1273663fa
--- /dev/null
+++ b/WebServer/serverWeb.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAus8Cd8Sbi0INrTFZpa0C8YfC+XDujcxbb4SbSjCiF2LsrP/U
+htx8vZGveJCXKzVctiu2ONDnTp/1c4d39w2ENAJfNcqXQbm0c3czKPQQC+keEBku
+MQybeNk4Am4cGKBeF4YhWVYm6qfhcnTBdjcnU+TkqH/q9F0pYnwWgNTupgfVuPrm
+Ma1/lKe1sgJcMzGvzp9w9sT8dh/zrmIW9gOUDM4/WitHYV77RlXb9uQLBrZAh8r0
+kodz5Q5njqciyGo3TCMmtWsEwevy2+WpcN2w4SqQvPUjAUniDxz0MYIBQgVwK2Za
+K3gyyX7Oc8rFg1g6GXZAFdFlv6fdJcrqYrW8FwIDAQABAoIBAFEbK7EgVYAiz5lQ
+geGiulJvZUGzvH8oKNLEOj/92YJZ2vRJptZeyHHt3Md1z4xdAMG/PMByQtsqLAFa
+4cULw0hpdzj9mqpYnHY9XKL9RDJHplvK8vksxhu0A9NaRyySBAgmnjgRZZggB4wQ
+ESboT1TnXjeiQjqScDNoOMT6rhq7Mfvylr7CE+u/6EEU5gh/nNWt4rO7pj4ZyL+3
+fivsiW+1vsTW/WxSJDACHTBSzny7LHSdawvxyVaWZTNdZ8Z3P/nFkjTlirSOVbBX
+bGIxfNBUj0hRG3wBJBfGXtFROp8DaeXLp5vE5qprCHhVTqwyXg5Yh3pD4l3rtdpY
+Vy+At9ECgYEA5YUtIrvHenOOZ6JIRORlVaUi4m8hIVMD/g6xjMMSvX9o8q8H5e/9
+wwVVGIkS3iBiiMOKLvLeR2+reQxGjeE3lLLwHNus3UZ3MFiyZeuqbn58Byw8jNX0
+u4Y1QPTYzFrb78gn0ou3PtmfSYnlPq7SJWMWBZ7mRdzYUM6XJ5Xtp/0CgYEA0Fxb
+Y0Czc28M2mMsKaYpfrI3VKD0Uz/BXsjylCMLtXWPooxjgjvsc9AEJ0qe9wesQWLj
+jF9lnOGj9rd408Zwh8c7Y0tXRLQcFVnACrwecwG8aggyiI5LMvE/c4qJ02Q833BZ
+DuhkBzbzs07KazInqhLlQl/tjE0i5fM1QjduvqMCgYEAkeHG4XfG/06pabddBeTB
+f+E5PgDyZtL0C6vdMCHhLG7qDq4vb/fNLAKcpr6hLmwZFOJsVxDpNTCGJacmxREs
+GahuM3lw8yfRo/oMUfmrVxWv0YNNbRqktfhEque1UJZDirGGli1VqG3772rlOaU2
+TqsfGS15IViQaTQWIQQLjSUCgYEAh7BNl2JQOtFL5oCFBw59oVN/8u3qjrhLPmXQ
+i6YS/vXzNyEDwJEzl+wUeF4BDdCCXgZ/Ny/85WCQPaAX4JovOE0HoM80orpEO6c6
+CAOgNLchs09pUUKRODihYKYMwYxalAv/A1VVptkjdVbPPWXpLLmncUU1VpP5MRTk
+Tx34Uc8CgYBwlD2g4C3rNXomrhH1RLMUgihUrQXZmf/IDFQzviHGV204H0e46KXS
+FGRj2t3a1rfL8BgqXckp9Tumwym7SCWdoEKZpXVXnbiKVFp+7HlToPKn0bDdB2tF
+V9a2y9klKlhSevbotFPvR4q+3Zibo3PnSXEP78w/pOsqn3WlYhW1cQ==
+-----END RSA PRIVATE KEY-----
diff --git a/WebServer/src/code/KeyCloak.java b/WebServer/src/code/KeyCloak.java
index 47d25081fef69823ea5f6a7fbca039d21b3c2701..66935d5e8593fcd2a1d8169bbe3085d214d1b757 100644
--- a/WebServer/src/code/KeyCloak.java
+++ b/WebServer/src/code/KeyCloak.java
@@ -38,9 +38,6 @@ public class KeyCloak extends HashMap<String,String> {
return get("realm");
}
-// public String clientId() {
-// return get("client-id");
-// }
public String redirectUri() {
return get("redirect-uri");
diff --git a/WebServer/src/code/ObtainToken.java b/WebServer/src/code/ObtainToken.java
index 6b0d0976f673e424e769e00ff70e1e3dc13219a7..9d19ba64325e92b77402eceaa66749043faf2635 100644
--- a/WebServer/src/code/ObtainToken.java
+++ b/WebServer/src/code/ObtainToken.java
@@ -54,86 +54,6 @@ public class ObtainToken implements HttpHandler{
strlist.add("text/html");
exchange.getResponseHeaders().put("content-type", strlist);
Helper.sendResponseOk(response, exchange);
-
-// if(wantsToken) {
- // NON FUNZIONA PERCHE' LA
-// String[] arr = stringURI.split("/secured");
-// for(int i=0; i<arr.length; i++)
-// System.out.println(arr[i]);
-// System.out.println("lunghezza = "+arr.length);
-//
-// String allParamsString = stringURI.split("/secured")[1];
-// System.out.println("allParamsString = "+allParamsString);
-// String[] allParamsArray = allParamsString.split("&");
-// String state = allParamsArray[0];
-// if(!this.state.equals(state)) {
-// Helper.badRequest(exchange);
-// return;
-// }
-// String authCode = allParamsArray[2];
-//
-// // request token
-// String httpsURL = "http://"+kcs.authServer()+"/realms/"+kcs.realm()+"/protocol/openid-connect/token";
-// URL myUrl = new URL(httpsURL);
-//// SSLUtilities.trustAllHttpsCertificates();
-//// SSLUtilities.trustAllHostnames();
-// HttpsURLConnection conn = (HttpsURLConnection)myUrl.openConnection();
-//
-// conn.setReadTimeout(7000);
-// conn.setConnectTimeout(7000);
-// conn.setRequestMethod("POST");
-// conn.setDoOutput(true);
-// conn.setDoInput(true);
-//
-// conn.setRequestProperty("content-type", "application/x-www-form-urlencoded");
-//
-// String body = "grant_type=authorization_code"
-// + "&client_id="+kcs.clientId()
-// + "&code_verifier="+codeVerifier
-// + "&code="+authCode
-// + "&redirect_uri=https://localhost:3000/secured";
-// OutputStream outputStream = conn.getOutputStream();
-// outputStream.write(body.getBytes("UTF-8"));
-// outputStream.close();
-//
-// String inputLine;
-// InputStream is = conn.getInputStream();
-// InputStreamReader isr = new InputStreamReader(is);
-// BufferedReader br = new BufferedReader(isr);
-// String response = "";
-// while ((inputLine = br.readLine()) != null) {
-// response += inputLine;
-// }
-//
-// br.close();
-// System.out.println(response);
-// String answer = response.replace(remoteHOST,localHOST);
-
-// }
}
-
-
-
-
-
-
-
-//
-// private String createRandomString() {
-// SecureRandom sr = new SecureRandom();
-// byte[] code = new byte[32];
-// sr.nextBytes(code);
-// return java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(code);
-// }
-//
-//
-// private String createCodeChallenge(String verifier) throws UnsupportedEncodingException, NoSuchAlgorithmException {
-// byte[] bytes = verifier.getBytes("US-ASCII");
-// MessageDigest md = MessageDigest.getInstance("SHA-256");
-// md.update(bytes, 0, bytes.length);
-// byte[] digest = md.digest();
-// return Base64.encodeBase64URLSafeString(digest);
-// }
-
}
\ No newline at end of file
diff --git a/WebServer/src/code/Resources.java b/WebServer/src/code/Resources.java
index 016b08073cec16d84377bf381b4213705e66b012..7c21ab658e5f0261c624e9ae3e754a7349ccfef0 100644
--- a/WebServer/src/code/Resources.java
+++ b/WebServer/src/code/Resources.java
@@ -22,35 +22,29 @@ public class Resources implements HttpHandler {
String requestURI = exchange.getRequestURI().toASCIIString().replace("/secured/home/","/");
String requestMethod = exchange.getRequestMethod();
- if (Helper.isSameString(requestMethod, "GET")) {
- String response = getLocalPage(requestURI);
- if(response.equals("fail")){
- //nel caso in cui non ci sia il file (perche non stato scaricato), allora creo un file fittizzio per non far crashare tutto il resto
- String[] requestedPath = requestURI.split("/");
- // get the last element of requestedPath and remove .js
- String[] requestedPage = requestedPath[requestedPath.length-1].split("\\.");
- String className = requestedPage[0];
- // make requested page with the first letter capitalized
- className = className.substring(0, 1).toUpperCase() + className.substring(1);
- response = "class "+className+"{}\nexport default " +className;
- }
- List<String> strlist = new ArrayList<>();
- switch (requestURI.substring(1, 4)) {
- case "js/" : strlist.add("text/javascript"); break;
- case "css" : strlist.add("text/css"); break;
- // case "con" : strlist.add("text/plain"); break;
- // case "con" : strlist.add("application/json"); break;
- // default : strlist.add("text/plain"); break;
- default: strlist.add("text"); break;
- }
- exchange.getResponseHeaders().put("content-type", strlist);
- exchange.sendResponseHeaders(200, response.getBytes().length);
- OutputStream os = exchange.getResponseBody();
- os.write(response.getBytes());
- os.close();
- } else {
+ if (!Helper.isSameString(requestMethod, "GET")) {
Helper.methodNotAllowed(exchange);
+ return;
+ }
+ String response = getLocalPage(requestURI);
+ if(response == null || Helper.isSameString(response, "fail")){
+ //nel caso in cui non ci sia il file (perche non stato scaricato), allora creo un file fittizzio per non far crashare tutto il resto
+ String[] requestedPath = requestURI.split("/");
+ // get the last element of requestedPath and remove .js
+ String[] requestedPage = requestedPath[requestedPath.length-1].split("\\.");
+ String className = requestedPage[0];
+ // make requested page with the first letter capitalized
+ className = className.substring(0, 1).toUpperCase() + className.substring(1);
+ response = "class "+className+"{}\nexport default " +className;
+ }
+ List<String> strlist = new ArrayList<>();
+ switch (requestURI.substring(1, 4)) {
+ case "js/" : strlist.add("text/javascript"); break;
+ case "css" : strlist.add("text/css"); break;
+ default: strlist.add("text"); break;
}
+ exchange.getResponseHeaders().put("content-type", strlist);
+ Helper.sendResponseOk(response, exchange);
}
private static String getLocalPage(String uri) {
diff --git a/WebServer/src/code/Server.java b/WebServer/src/code/Server.java
index f411c3c3d2aad83133d3826c053d03d68d07a30f..be92984ca12b4cc6b36e4b52004dd5b269d10ad9 100644
--- a/WebServer/src/code/Server.java
+++ b/WebServer/src/code/Server.java
@@ -80,7 +80,6 @@ public class Server {
server.createContext("/js/authentication/",new Resources());
server.createContext("/js/templates/",new Resources());
server.createContext("/css/",new Resources());
- // server.createContext("/conf/",new Resources());
server.createContext("/res/",new ImageRes());
server.createContext("/secured/home/js/",new Resources());
server.createContext("/secured/home/css/",new Resources());
diff --git a/WebServer/webServer.srl b/WebServer/webServer.srl
new file mode 100644
index 0000000000000000000000000000000000000000..24b9b44a22fbe1084e61798e180ca822afdb56cd
--- /dev/null
+++ b/WebServer/webServer.srl
@@ -0,0 +1 @@
+3A138A02CF04B956146CEDBAA263F0DCA29654FA