Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/utilities/serverAccessLogger.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ function buildLogEntry(req, params, options) {
turnAroundTime: options.turnAroundTime ?? undefined,
referer: options.referer ?? undefined,
userAgent: options.userAgent ?? undefined,
versionID: options.versionID ?? undefined,
versionId: options.versionId ?? undefined,
signatureVersion: authInfo?.getAuthVersion() ?? undefined,
cipherSuite: req.socket?.encrypted ? req.socket.getCipher()['standardName'] : undefined,
authenticationType: authInfo?.getAuthType() ?? undefined,
Expand Down Expand Up @@ -581,7 +581,7 @@ function logServerAccess(req, res) {
objectSize: params.objectSize ?? getObjectSize(req, res),
totalTime: calculateTotalTime(params.startTime, params.onFinishEndTime),
turnAroundTime: calculateTurnAroundTime(params.startTurnAroundTime, endTurnAroundTime),
versionID: req.query?.versionId,
versionId: req.query?.versionId,
aclRequired: undefined, // TODO: CLDSRV-774
referer: req.headers?.referer,
userAgent: req.headers?.['user-agent'],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenko/cloudserver",
"version": "9.2.23",
"version": "9.2.24",
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
"main": "index.js",
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/utils/serverAccessLogger.js
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ describe('serverAccessLogger utility functions', () => {
assert.strictEqual(loggedData.turnAroundTime, '1');
assert.strictEqual(loggedData.referer, 'https://example.com');
assert.strictEqual(loggedData.userAgent, 'aws-cli/2.0.0');
assert.strictEqual(loggedData.versionID, 'version123');
assert.strictEqual(loggedData.versionId, 'version123');
assert.strictEqual(loggedData.signatureVersion, 'AWS4-HMAC-SHA256');
assert.strictEqual(loggedData.cipherSuite, 'TLS_AES_128_GCM_SHA256');
assert.strictEqual(loggedData.authenticationType, 'REST-HEADER');
Expand Down Expand Up @@ -996,7 +996,7 @@ describe('serverAccessLogger utility functions', () => {

assert.strictEqual(mockLogger.write.callCount, 1);
const loggedData = JSON.parse(mockLogger.write.firstCall.args[0].trim());
assert.strictEqual('versionID' in loggedData, false);
assert.strictEqual('versionId' in loggedData, false);
});

it('should handle loggingEnabled without TargetBucket/TargetPrefix', () => {
Expand Down Expand Up @@ -1099,7 +1099,7 @@ describe('serverAccessLogger utility functions', () => {
assert.strictEqual('bytesDeleted' in loggedData, false);
assert.strictEqual('turnAroundTime' in loggedData, false);
assert.strictEqual('referer' in loggedData, false);
assert.strictEqual('versionID' in loggedData, false);
assert.strictEqual('versionId' in loggedData, false);
assert.strictEqual('cipherSuite' in loggedData, false);
assert.strictEqual('tlsVersion' in loggedData, false);
assert.strictEqual('aclRequired' in loggedData, false);
Expand Down
Loading