fix(tls-logging): ZMSA-40: where possible use _ip in gelf logs instead of _remoteAddress (#929)

* where possible use _ip in gelf logs instead of _remoteAddress

* api.js add _req when logging remoteAddress

Author: NickOvt

api.js

@@ -82,7 +82,7 @@ const serverOptions = {
             let message = {
                 short_message: 'HTTP [' + req.method + ' ' + path + '] ' + (body.success ? 'OK' : 'FAILED'),
 
-                _remote_ip: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
+                _req_remoteAddress: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
 
                 _ip: ((req.params && req.params.ip) || '').toString().substr(0, 40) || '',
                 _sess: ((req.params && req.params.sess) || '').toString().substr(0, 40) || '',
@@ -168,13 +168,11 @@ if (config.api.secure && certOptions.key) {
 
     let defaultSecureContext = tls.createSecureContext(httpsServerOptions);
 
-    httpsServerOptions.SNICallback = (opts, cb) => {
-        if (typeof opts === 'string') {
-            opts = {
-                servername: opts,
-                meta: {}
-            };
-        }
+    httpsServerOptions.SNICallback = (servername, cb) => {
+        const opts = {
+            servername,
+            meta: {}
+        };
 
         certs
             .getContextForServername(

imap-core/lib/imap-server.js

@@ -360,7 +360,7 @@ class IMAPServer extends EventEmitter {
             }
             meta.protocol = 'imap';
             meta.stage = 'connect';
-            meta.remoteAddress = remoteAddress;
+            meta.ip = remoteAddress;
 
             if (err) {
                 err.meta = meta;

lib/cert-handler.js

@@ -595,7 +595,7 @@ class CertHandler {
                         short_message: `SNI request for ${servername}`,
                         _sni_servername: servername,
                         _sni_source: meta.source,
-                        _sni_remoteAddress: meta.remoteAddress
+                        _ip: meta.remoteAddress
                     },
                     payload || {}
                 )

lib/pop3/server.js

@@ -120,7 +120,7 @@ class POP3Server extends EventEmitter {
             }
             meta.protocol = 'pop3';
             meta.stage = 'connect';
-            meta.remoteAddress = remoteAddress;
+            meta.ip = remoteAddress;
 
             if (err) {
                 err.meta = meta;