Merge pull request #65 from digital-land/removeIPFromLogs

remove ip address from logs
digital-land · Feb 27, 2024 · dcfbdf1 · dcfbdf1
2 parents 9ca1578 + a98dc27
commit dcfbdf1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/index.js b/index.js
@@ -21,8 +21,7 @@ app.use(async (req, res, next) => {
     method: req.method,
     endpoint: req.originalUrl,
     message: `${req.method} request made to ${req.originalUrl}`,
-    sessionId: await hash(req.sessionID),
-    ipAddress: await hash(req.ip)
+    sessionId: await hash(req.sessionID)
   })
   next()
 })

diff --git a/src/controllers/uploadController.js b/src/controllers/uploadController.js
@@ -81,13 +81,12 @@ class UploadController extends PageController {
     }
   }
 
-  constructBaseFormData ({ dataset, dataSubject, geomType, organisation, sessionId, ipAddress }) {
+  constructBaseFormData ({ dataset, dataSubject, geomType, organisation, sessionId }) {
     const formData = new FormData()
     formData.append('dataset', dataset)
     formData.append('collection', dataSubject)
     formData.append('organisation', organisation)
     formData.append('sessionId', sessionId)
-    formData.append('ipAddress', ipAddress)
 
     if (geomType) { formData.append('geom_type', geomType) }
 
@@ -99,8 +98,7 @@ class UploadController extends PageController {
       dataset: req.sessionModel.get('dataset'),
       dataSubject: req.sessionModel.get('data-subject'),
       geomType: req.sessionModel.get('geomType'),
-      sessionId: req.session.id,
-      ipAddress: req.ip
+      sessionId: req.session.id
     }
   }
 }

diff --git a/src/controllers/uploadFileController.js b/src/controllers/uploadFileController.js
@@ -64,9 +64,9 @@ class UploadFileController extends UploadController {
   }
 
   async apiValidateFile (datafile) {
-    const { filePath, fileName, dataset, dataSubject, organisation, sessionId, ipAddress } = datafile
+    const { filePath, fileName, dataset, dataSubject, organisation, sessionId } = datafile
 
-    const formData = this.constructBaseFormData({ dataset, dataSubject, organisation, sessionId, ipAddress })
+    const formData = this.constructBaseFormData({ dataset, dataSubject, organisation, sessionId })
     const file = new Blob([await fs.readFile(filePath)], { type: lookup(filePath) })
     formData.append('upload_file', file, fileName)
 

diff --git a/src/controllers/uploadUrlController.js b/src/controllers/uploadUrlController.js
@@ -19,8 +19,8 @@ class UploadUrlController extends UploadController {
     super.post(req, res, next)
   }
 
-  async apiValidateUrl (url, { dataset, dataSubject, geomType, organisation, sessionId, ipAddress }) {
-    const formData = this.constructBaseFormData({ dataset, dataSubject, geomType, organisation, sessionId, ipAddress })
+  async apiValidateUrl (url, { dataset, dataSubject, geomType, organisation, sessionId }) {
+    const formData = this.constructBaseFormData({ dataset, dataSubject, geomType, organisation, sessionId })
     formData.append('upload_url', url)
 
     const result = await axios.post(this.apiRoute, formData, { timeout: config.api.requestTimeout })

diff --git a/src/utils/logging.js b/src/utils/logging.js
@@ -1,13 +1,12 @@
 import logger from '../utils/logger.js'
 import hash from '../utils/hasher.js'
 
-const logPageView = (route, sessionID, ipAddress) => {
+const logPageView = (route, sessionID) => {
   logger.info({
     type: 'PageView',
     pageRoute: route,
     message: `page view occurred for page: ${route}`,
-    sessionId: hash(sessionID),
-    ipAddress: hash(ipAddress)
+    sessionId: hash(sessionID)
   })
 }
 

diff --git a/test/unit/PageController.test.js b/test/unit/PageController.test.js
@@ -36,7 +36,7 @@ describe('PageController', () => {
     expect(callArgs.pageRoute).toEqual('/dataset')
     expect(callArgs.message).toEqual('page view occurred for page: /dataset')
     expect(callArgs.sessionId).toEqual(await hash('123'))
-    expect(callArgs.ipAddress).toEqual(await hash('1234'))
+    expect(callArgs.ipAddress).toBeUndefined()
     expect(callArgs.level).toEqual('info')
     expect(callArgs.service).toEqual('lpa-data-validation-frontend')
   })

diff --git a/test/unit/uploadFileController.test.js b/test/unit/uploadFileController.test.js
@@ -69,7 +69,6 @@ describe('UploadFileController', () => {
       dataset: 'test',
       dataSubject: 'test',
       geomType: 'test',
-      ipAddress: 'fakeIp',
       sessionId: 'sessionId'
     })
     expect(req.body.validationResult).toEqual(mockApiValue)