NOISSUE - Update Nginx Docker Image

docker/docker-compose.yml

@@ -68,7 +68,7 @@ services:
       - mainflux-keto-db-volume:/var/lib/postgresql/data
 
   nginx:
-    image: nginx:1.20.0-alpine
+    image: nginx:1.23.3-alpine
     container_name: mainflux-nginx
     restart: on-failure
     volumes:

docker/nginx/nginx-x509.conf

@@ -20,8 +20,10 @@ events {
 http {
     include snippets/http_access_log.conf;
 
-    js_include authorization.js;
-    js_set $auth_key setKey;
+    js_path "/etc/nginx/njs/";
+    js_import authorization from /etc/nginx/authorization.js;
+
+    js_set $auth_key authorization.setKey;
 
     sendfile on;
     tcp_nopush on;
@@ -137,7 +139,9 @@ stream {
    include snippets/stream_access_log.conf;
 
     # Include JS script for mTLS
-    js_include authorization.js;
+    js_path "/etc/nginx/njs/";
+
+    js_import authorization from /etc/nginx/authorization.js;
 
     # Include single-node or multiple-node (cluster) upstream
     include snippets/mqtt-upstream.conf;
@@ -151,7 +155,7 @@ stream {
         listen [::]:${MF_NGINX_MQTTS_PORT} ssl;
 
         include snippets/ssl.conf;
-        js_preread authenticate;
+        js_preread authorization.authenticate;
 
         proxy_pass mqtt_cluster;
     }

docker/ssl/Makefile

@@ -8,7 +8,7 @@ CN_SRV = localhost
 THING_KEY = <THING_KEY> # e.g. 8f65ed04-0770-4ce4-a291-6d1bf2000f4d
 CRT_FILE_NAME = thing
 
-all: clean_certs ca server_crt
+all: clean_certs ca server_cert
 
 # CA name and key is "ca".
 ca:
@@ -41,4 +41,3 @@ thing_cert:
 clean_certs:
 	rm -r $(CRT_LOCATION)/*.crt
 	rm -r $(CRT_LOCATION)/*.key
-	rm -r $(CRT_LOCATION)/*.srl

docker/ssl/authorization.js

@@ -29,8 +29,8 @@ function authenticate(s) {
 
         var pass = parsePackage(s, data);
 
-        if (!clientKey.length || pass !== clientKey) {
-            s.error('Cert CN (' + clientKey + ') does not match client password');
+        if (!clientKey.length || !clientKey.endsWith(pass) ) {
+            s.error('Cert CN (' + clientKey + ') does not contain client password');
             s.off('upload')
             s.deny();
             return;
@@ -167,10 +167,12 @@ function parseCert(cert, key) {
         for (var i = 0; i < pairs.length; i++) {
             var pair = pairs[i].split('=');
             if (pair[0].toUpperCase() == key) {
-                return pair[1];
+                return "Thing " + pair[1].replace("\\", "").trim();
             }
         }
     }
 
     return '';
 }
+
+export default {setKey,authenticate};

docker/ssl/certs/ca.crt

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDjzCCAnegAwIBAgIUQ1AagVQXCuOIzmGXm+KhsbyBc18wDQYJKoZIhvcNAQEN
-BQAwVzESMBAGA1UEAwwJbG9jYWxob3N0MREwDwYDVQQKDAhNYWluZmx1eDEMMAoG
-A1UECwwDSW9UMSAwHgYJKoZIhvcNAQkBFhFpbmZvQG1haW5mbHV4LmNvbTAeFw0x
-OTA0MDEwOTI3MDFaFw0yMjAzMzEwOTI3MDFaMFcxEjAQBgNVBAMMCWxvY2FsaG9z
-dDERMA8GA1UECgwITWFpbmZsdXgxDDAKBgNVBAsMA0lvVDEgMB4GCSqGSIb3DQEJ
-ARYRaW5mb0BtYWluZmx1eC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCq6O4PHwgGOmEafjea5KocG80GYSYbvN37ums6fQ1wcmCxn8LtZek8WkfJ
-S2NQQPDvn8QWRY7aUkTAW7cEB4vxpT25bevP7KJNFAS8XZO7NTfF8fscJS+YWSXz
-VS0OFZ2YuqTnjCiqWf5mvjAkkXBGIYq+k2ONM1tHlEA0lzbLun2a9H/XarCG+znj
-pfYpW6R08zFzXyGb4sI2pyYpP7iZLla7PTSZTt9h6jkY3qqMDhEHhPdlXDhO1O9/
-lA8yWMO9vKCzC7ngDXnV99Nl+tFhp9z9VkTUveLMuN9+riDJRfP25fOzHuRYzmsR
-emYjD1NvSgsvFqSbFDVXB8kcyrXPAgMBAAGjUzBRMB0GA1UdDgQWBBRs4xR91qEj
-NRGmw391xS7x6Tc+8jAfBgNVHSMEGDAWgBRs4xR91qEjNRGmw391xS7x6Tc+8jAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDQUAA4IBAQAAPMf7bVFhzUG8AYq0
-VS9BWVwVtdNzZ3X9FkG9O+tZZO43GlaToym8PmhJHF9wk3AA+pmgfcmBrHcTG0me
-PeincN2euO0c4iv1f/i4bAY5/iq/Q0w/GiuTL5VLVpaH1SQrWhc0ZD7Ii+lVPpFQ
-bJXKHFQBnZU7mWeQnL9W1SVhWfsSKShBkAEUeGXo3YMC7nYsFJkl/heC3sYqfrW4
-7fq80u+TU6HjGetSAWKacae7eeNmprMn0lFw2VqPQG3M4M0l9pEfcrRygOAnqNKO
-aNi2UYKBla3XeDjObovOsXRScTKmJZwJ/STJlu+x5UAwF34ZBJy0O2qdd+kOxAhj
-5Yq2
+MIIDuzCCAqOgAwIBAgIUF93//gxz1PfPgtbaOY3Fj/H4URYwDQYJKoZIhvcNAQEN
+BQAwbTEgMB4GA1UEAwwXTWFpbmZsdXhfU2VsZl9TaWduZWRfQ0ExETAPBgNVBAoM
+CE1haW5mbHV4MRQwEgYDVQQLDAttYWluZmx1eF9jYTEgMB4GCSqGSIb3DQEJARYR
+aW5mb0BtYWluZmx1eC5jb20wHhcNMjMwMTI0MTQ0NjMxWhcNMjYwMTIzMTQ0NjMx
+WjBtMSAwHgYDVQQDDBdNYWluZmx1eF9TZWxmX1NpZ25lZF9DQTERMA8GA1UECgwI
+TWFpbmZsdXgxFDASBgNVBAsMC21haW5mbHV4X2NhMSAwHgYJKoZIhvcNAQkBFhFp
+bmZvQG1haW5mbHV4LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+APhtdyNf5Eh/kuKxDnauoHe/PmX9cehq53i5zewnR2jMsFS1jkksLmoFthTvcAIA
+uOtwcPaUpWq3oNLpqC4JkMCgBF+Qgu/N2AL8fx5QJQSjo8bF9pe2JgDI3AhpcoJi
+RxJNPOr32GysTaOW43Wup0hUJcRor3ht9Bu2HpGTNmVUdTw16O+6k6/S1fu0K/RM
+OF/NXEK6be7zHS/ET3SMLWWKFFf3VyBYcf5SuLhVFbjhJC/H1f8eQQeY+ctcAJEv
+hAG1BkujMkSP0mlSVx8mg6duKTO2+F7qBXgjJTBwMfqjwxBFv0Ag/SGyWLBHH3h9
+dArz0p4xknjtZAcXH7Ld5r0CAwEAAaNTMFEwHQYDVR0OBBYEFGermV/h4kUH/EMX
+brQOWE1sgYdlMB8GA1UdIwQYMBaAFGermV/h4kUH/EMXbrQOWE1sgYdlMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQENBQADggEBABuOu3wxjWvTVHlxuZxVxRTB
+IakGP0v8W6KRRb0aVMDwa49Kk1o1Pi0vAcgMPXSJosjb1oQr4UTjwc6yRGtEt9QU
+KSPlsDmLr4GkK3Cm2dprpBFFnN1C7IkNOMYdZN+kbz+7eyYKYgNI8X97p6bmc4xZ
+2IPxNU0ZEojn4oQCfwf9iPxGn4Hdpu3ZlhN54VCp0EosuyMB3GjR3KzQO1fM6Eeo
++xCkKhjuzEV+HetsWLYAmcVfOt7soTBNALbTgdEcA6LutO2JvGidQKyc9I/9m+Ox
+i+G5y4vRVmMff94AethLVI9XtXCYjhxsEEm2hI9laq9dbv5/+9RgSHibVkX9aL4=
 -----END CERTIFICATE-----

docker/ssl/certs/ca.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCq6O4PHwgGOmEa
-fjea5KocG80GYSYbvN37ums6fQ1wcmCxn8LtZek8WkfJS2NQQPDvn8QWRY7aUkTA
-W7cEB4vxpT25bevP7KJNFAS8XZO7NTfF8fscJS+YWSXzVS0OFZ2YuqTnjCiqWf5m
-vjAkkXBGIYq+k2ONM1tHlEA0lzbLun2a9H/XarCG+znjpfYpW6R08zFzXyGb4sI2
-pyYpP7iZLla7PTSZTt9h6jkY3qqMDhEHhPdlXDhO1O9/lA8yWMO9vKCzC7ngDXnV
-99Nl+tFhp9z9VkTUveLMuN9+riDJRfP25fOzHuRYzmsRemYjD1NvSgsvFqSbFDVX
-B8kcyrXPAgMBAAECggEAbp/el0MKup1HBRL1gvjHcvI7vwla1VFmje2YQn93F3Wx
-SMeUMH1qfnohRRXa7rNaQIA1OAVF9eKSRcAXsjAAUSUX0tJndGpCk4mFlzcqzF4h
-/6olU45uRDpP6jUTuK4dGCKXYpjCKaGenXo1RzYsafiECd707Qx05Nv8ww2tlifN
-HtUR0xCZfVGDZfmNMZVrksUIZ1XHwZNtNLWQW6MBl3RhFaA0Wz/RfFMi2FzacEbj
-75IqE6PLic1fin6P3GouzKamtZ6YPTyR5PqxCOCw97oZDCUGy2qGyAuPUi9O2HKB
-fQgSyIxuR73S2korvxAmvekubjBFAqhan2oEjZs6oQKBgQDT28COlC33BSrpr2+V
-pZIL4Bb1rGHreTi1M/4n9nP3GOZ9gqnSUsWXyxYVoZ2YfixorjZhUzHyx4SfZ2E9
-p5PkIJ0wOiHLlKQ36vEVN9ZO1UyNCYUgs3seW40xnsAiMNczZjufIZrsejO3tc2j
-Jhgp+B/9Bt5A8us2ewhz3LlQowKBgQDOhQmZAfL/xAjYBCUS73t/YO60i5e1yg2J
-i6jXeKjd5gRZ32upkBzQ8UBvAGSQGqrcCnqIzrU5TeeD046bZzkokg7iKwHwQDrL
-SXTthUB6ABZddP/VXCEUVBer3FEnUgJm9jw08RzmPyNEPjfp91FDmJ9GYcbdo/nL
-hBPHh3lc5QKBgQCJYZ0yWACeiKlVNECFqAJW1Q/Oa+RrkAYn6vlK7NQyTeFZTlvV
-WXtsfXNqv4y0kE037JCy+AIRzzO/MoiqNHsAme2Ukn3LyC3dXOrMuZKtOEAVzTCZ
-Dgoum2up26n4AffrCsZq4J3X7z6OSMR6oX9V5+LGb6e8Mko43/uRNnatRQKBgEMH
-bQkLV+ppnxE1ry7JKcU7Gd7hm9j1/pTRDnj5AZ4b5Peii1ganS+3zdj5QKqA7UnD
-4Od8Z9d0kJr51EReKXAgj9IacWOgBTUr31akNDwkwR2ONubyIw5tCM3QEUr41CzE
-6N+qDl4wyeqBYzZ9/hM5eyCl5ZzUduP2N1FAiER9AoGAW2T0OeM5ZsPABMKu9eEN
-FB9bVysqWT1tExB34OGWrZvNEzsHTqvr/D3KSWv0PS1pM46M1XkVbybOzRmPrzab
-AGMDJXgGhMuk2UtDA/s9mgqTOeDXpvmaFyThVkoH162j6GMuX2SwxHnH9D42zgMR
-3LEZ/5Q5HMJ4jwEM880jvP4=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD4bXcjX+RIf5Li
+sQ52rqB3vz5l/XHoaud4uc3sJ0dozLBUtY5JLC5qBbYU73ACALjrcHD2lKVqt6DS
+6aguCZDAoARfkILvzdgC/H8eUCUEo6PGxfaXtiYAyNwIaXKCYkcSTTzq99hsrE2j
+luN1rqdIVCXEaK94bfQbth6RkzZlVHU8NejvupOv0tX7tCv0TDhfzVxCum3u8x0v
+xE90jC1lihRX91cgWHH+Uri4VRW44SQvx9X/HkEHmPnLXACRL4QBtQZLozJEj9Jp
+UlcfJoOnbikztvhe6gV4IyUwcDH6o8MQRb9AIP0hsliwRx94fXQK89KeMZJ47WQH
+Fx+y3ea9AgMBAAECggEAHi+U5KI795gyxaNMddzRqEM/Zn6lht9oiVmQXTPHoEMQ
+4PYfmCILcLwJbCFM651hWtBSlY+pyt4Np1sXYaKtaU54QZFqa4+IQhKispD78oSc
+u6QlyrjqBLnjTI1didy9tIpYjtd3P3svQuOsd0n1zxrUbPloatp3aR+Xtsobt7OO
+cvp01Sg/tik9t4N2Jo6TEjdnZM+f17w2Dkesl1vfWqNSat+U0yMipIRTgPh/o+gW
+Cr5XtBbTkdjV7ivl6iMsS/5pFCAl9WysarFECoaFRaUhS/4t8fH5roSz1CXNTaib
+DPA7U5UM+Bott/yud89I0wIEcCcNL24bdrhwuSTuWQKBgQD82S4dVX3AcM9kuaty
+0bdvgKgA7P1Gy4eI2igC6lqD/Qbz0vHJvlts+7rHE7muYLRnMIWaDdhFRDuiWwa3
+mp358H+BsXHpAdjKlCp1/5KnFKZfB18LU5ZdSyEbs92l9q3JKJqneAN2wof71pTg
+i1jFLNDnK6D1nxZzjfcSX43CZQKBgQD7hi3O2INYZ5wE640T86Fbup5yDGKk6aIP
+ddbYE2S2pQx1ywgFcoN33m+5/F7A5yLg7Xf8nR4p110PM+apflNJlvX5y6cISa3A
+yFS989SlTFLrMWZB/Y/lyXuDEN+fYK+KvKM7eLsH4byPXXkKW20C0/ua1vyNwhjg
+rZfiY7YheQKBgEKVRml/G9BTZKnXouhnhXCdZqBnyAKekiBdom+yGwfq16vZfsZr
+lFPMrlDCRwE+ggMyadw5jRwgbbvBULGEy9kHlewnOCHt1JL0FYJhPNM2wuD/Ze3r
+owsKP7u1z8ZmgTkZsjArkG3zqC+PQEEpMMUrmg9mE8rai+T+G3QBKalpAoGAO6Aj
+W9WXzW1CXyg32XL33Xbv+LlW6SE5edDFjZOLXIDj40iuLhxnbhMdCUn6bGBetFOX
+Dhtw+xpCxUfYdnWr6NYQmZbdkelldz4GWMFkt4rQXVDonNwvMJoC3Z8yY+XXt1vg
+lkiYjdXFjXbrKrlhrjnye1JbrH9GxnxgdRqOIoECgYBiJ+8Wx6qHHmaHWDlpqOdE
+uGiVnL0j+YJCQjxzeFeCQf+YfQ1dAXzzCAfHDtvG8G1UpMKJZGrbCueLfGH1nrO/
+Z12j/jFEd7aP6z36BlHTLXdLMZBLCwDfKkLm76X9XaV+bSu3yvI0ij0B9ZcN3vxK
+eapGGxRUvEQnTotlPj/e0g==
 -----END PRIVATE KEY-----

docker/ssl/certs/mainflux-server.crt

@@ -1,25 +1,26 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+HoM7BKxWti0=
 -----END CERTIFICATE-----

docker/ssl/certs/mainflux-server.key

@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-eFet28DEMzSifudXY3LYE5N0Vl6g+A==
+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
+1dbGt3WW9bPnV1QjLZmrGTGsgpbMJA==
 -----END PRIVATE KEY-----