Merge pull request #570 from telefonicaid/task/rename_access_log_fields

Task/rename access log fields

Author: manucarrace

CHANGES_NEXT_RELEASE

@@ -1,5 +1,6 @@
 - Add: allow authorize using local PDP implementation (new config.localPDP / AUTHORIZE_BY_LOCAL_PDP setting) (#571)
 - Add: get roles from keystone and cache them using role names (#571)
+- Rename: access logger fields: Service -> srv and SubService -> subsrv (#568)
 - Remove node cache legacy callbacks warning
 - Fix: fill from log field with real IP
 - Upgrade NodeJS version from 16-slim to 24-bullseye-slim in Dockerfile

README.md

@@ -452,17 +452,17 @@ Accounting access log include data about:
 * UserId
 * UserName
 * ServiceId
-* Service
+* srv
 * SubServiceId
-* SubService
+* subsrv
 * Action
 * Path
 * Body (Truncated to 100 chars when is valid access)
 * Date
 * Query
 Example of access log:
 ```
-"Right Attempt | ResponseStatus=200 | Token=gAAAAABnBPgPrgwpcAkbQOZIryu5ADUIScyorN3vbPYbTJxTE5AF3RO1y25Tf-sL3EKzvfr_1U3u8IL8ylB4e4B_vD5yZjc9rnrSIqoiC77B7uZ1O1xZCyukq_MkjRxJLqA9yQ5lQtAQCC6ig7Kn5uPhpPD-mhVb7kyQjUw1QjtCiyP7UKXZvKU | Origin=172.17.0.22 | UserId=753b954985bf460fabbd6953c71d50c7 | UserName=adm1 | ServiceId=9f710408f5944c3993db600810e97c83 | Service=smartcity | SubServiceId=/ | SubService=/ | Action=read | Path=/v2/entities | Query={\"limit\":\"15\",\"offset\":\"0\",\"options\":\"count\"} | Body={} | Date=2024-10-08T09:25:30.441Z"
+"Right Attempt | ResponseStatus=200 | Token=gAAAAABnBPgPrgwpcAkbQOZIryu5ADUIScyorN3vbPYbTJxTE5AF3RO1y25Tf-sL3EKzvfr_1U3u8IL8ylB4e4B_vD5yZjc9rnrSIqoiC77B7uZ1O1xZCyukq_MkjRxJLqA9yQ5lQtAQCC6ig7Kn5uPhpPD-mhVb7kyQjUw1QjtCiyP7UKXZvKU | Origin=172.17.0.22 | UserId=753b954985bf460fabbd6953c71d50c7 | UserName=adm1 | ServiceId=9f710408f5944c3993db600810e97c83 | srv=smartcity | SubServiceId=/ | subsrv=/ | Action=read | Path=/v2/entities | Query={\"limit\":\"15\",\"offset\":\"0\",\"options\":\"count\"} | Body={} | Date=2024-10-08T09:25:30.441Z"
 ```
 
 Note that the above format is not the same than the regular PEP log (although it is also based in fields separated by `|`, the fields themselves are not the same).
@@ -509,7 +509,7 @@ configAccessMatch.body = [
 When any of theses patterns matches in current access, message access is added with `MATCHED <element> <value>` , where `<element>` would be: `USER`, `HEADER <header-name>`, `SUBPATH`, `SUBQUERY`, `BODY` and `<value>` the value which matches. For example:
 
 ```
-Right Attempt MATCHED HEADER fiware-service smartcity | ResponseStatus=200 | Token=gAAAAABnBPgPrgwpcAkbQOZIryu5ADUIScyorN3vbPYbTJxTE5AF3RO1y25Tf-sL3EKzvfr_1U3u8IL8ylB4e4B_vD5yZjc9rnrSIqoiC77B7uZ1O1xZCyukq_MkjRxJLqA9yQ5lQtAQCC6ig7Kn5uPhpPD-mhVb7kyQjUw1QjtCiyP7UKXZvKU | Origin=172.17.0.22 | UserId=753b954985bf460fabbd6953c71d50c7 | UserName=adm1 | ServiceId=9f710408f5944c3993db600810e97c83 | Service=smartcity | SubServiceId=/ | SubService=/ | Action=read | Path=/v2/entities | Query={\"limit\":\"15\",\"offset\":\"0\",\"options\":\"count\"} | Body={} | Date=2024-10-08T09:25:30.441Z"
+Right Attempt MATCHED HEADER fiware-service smartcity | ResponseStatus=200 | Token=gAAAAABnBPgPrgwpcAkbQOZIryu5ADUIScyorN3vbPYbTJxTE5AF3RO1y25Tf-sL3EKzvfr_1U3u8IL8ylB4e4B_vD5yZjc9rnrSIqoiC77B7uZ1O1xZCyukq_MkjRxJLqA9yQ5lQtAQCC6ig7Kn5uPhpPD-mhVb7kyQjUw1QjtCiyP7UKXZvKU | Origin=172.17.0.22 | UserId=753b954985bf460fabbd6953c71d50c7 | UserName=adm1 | ServiceId=9f710408f5944c3993db600810e97c83 | srv=smartcity | SubServiceId=/ | subsrv=/ | Action=read | Path=/v2/entities | Query={\"limit\":\"15\",\"offset\":\"0\",\"options\":\"count\"} | Body={} | Date=2024-10-08T09:25:30.441Z"
 ```
 Account log has three modes: `all`, `matched`, `wrong`. First one `all` includes right and wrong access regardles if matches or not. Second one `matched` includes all wrong and just rigth matches acess. And `wrong` mode only includes all wrong access, regardless is matches or not with patterns.
 

lib/fiware-pep-steelskin.js

@@ -83,9 +83,9 @@ function accountInfoError(error, req, res, next) {
                       ' | UserId=' + req.userId +
                       ' | ServiceId=' + req.serviceId +
                       ' | UserName=' + req.userName +
-                      ' | Service=' + req.service +
+                      ' | srv=' + req.service +
                       ' | SubServiceId=' + req.subserviceId +
-                      ' | SubService=' + req.subService +
+                      ' | subsrv=' + req.subService +
                       ' | Action=' + req.action +
                       ' | Path=' + req.path +
                       ' | Query=' + JSON.stringify(req.query) +

lib/middleware/proxy.js

@@ -275,9 +275,9 @@ function accountInfo(req, res, next) {
                                   ' | UserId=' + req.userId +
                                   ' | UserName=' + req.userName +
                                   ' | ServiceId=' + req.serviceId +
-                                  ' | Service=' + req.service +
+                                  ' | srv=' + req.service +
                                   ' | SubServiceId=' + req.subserviceId +
-                                  ' | SubService=' + req.subService +
+                                  ' | subsrv=' + req.subService +
                                   ' | Action=' + req.action +
                                   ' | Path=' + req.path +
                                   ' | Query=' + JSON.stringify(req.query) +