Skip to content

Commit 584a53e

Browse files
committed
Added changes to rename invalid_tls_cert_auth_failures to acl_access_denied_tls_cert and formatting changes
Signed-off-by: Omkar Mestry <[email protected]>
1 parent 58ad4dc commit 584a53e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/acl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,7 +2576,7 @@ static void ACLUpdateInfoMetrics(int reason) {
25762576
} else if (reason == ACL_DENIED_CHANNEL) {
25772577
server.acl_info.invalid_channel_accesses++;
25782578
} else if (reason == ACL_INVALID_TLS_CERT_AUTH) {
2579-
server.acl_info.invalid_tls_cert_auth_failures++;
2579+
server.acl_info.acl_access_denied_tls_cert++;
25802580
} else {
25812581
serverPanic("Unknown ACL_DENIED encoding");
25822582
}

src/networking.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
#include "fmtargs.h"
3838
#include "io_threads.h"
3939
#include "module.h"
40+
#include "connection.h"
4041
#include <strings.h>
4142
#include <sys/socket.h>
4243
#include <sys/uio.h>
4344
#include <math.h>
4445
#include <ctype.h>
4546
#include <stdatomic.h>
46-
#include "connection.h"
4747
#include <stdbool.h>
4848

4949
/* This struct is used to encapsulate filtering criteria for operations on clients

src/server.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2946,7 +2946,7 @@ void initServer(void) {
29462946
server.acl_info.invalid_key_accesses = 0;
29472947
server.acl_info.user_auth_failures = 0;
29482948
server.acl_info.invalid_channel_accesses = 0;
2949-
server.acl_info.invalid_tls_cert_auth_failures = 0;
2949+
server.acl_info.acl_access_denied_tls_cert = 0;
29502950

29512951
/* Create the timer callback, this is our way to process many background
29522952
* operations incrementally, like eviction of unaccessed expired keys, etc. */
@@ -5586,10 +5586,10 @@ sds genValkeyInfoStringACLStats(sds info) {
55865586
"acl_access_denied_cmd:%lld\r\n"
55875587
"acl_access_denied_key:%lld\r\n"
55885588
"acl_access_denied_channel:%lld\r\n"
5589-
"invalid_tls_cert_auth_failures:%lld\r\n",
5589+
"acl_access_denied_tls_cert:%lld\r\n",
55905590
server.acl_info.user_auth_failures, server.acl_info.invalid_cmd_accesses,
55915591
server.acl_info.invalid_key_accesses, server.acl_info.invalid_channel_accesses,
5592-
server.acl_info.invalid_tls_cert_auth_failures);
5592+
server.acl_info.acl_access_denied_tls_cert);
55935593
return info;
55945594
}
55955595

src/server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ typedef struct aclInfo {
13191319
long long invalid_cmd_accesses; /* Invalid command accesses that user doesn't have permission to */
13201320
long long invalid_key_accesses; /* Invalid key accesses that user doesn't have permission to */
13211321
long long invalid_channel_accesses; /* Invalid channel accesses that user doesn't have permission to */
1322-
long long invalid_tls_cert_auth_failures; /* Invalid channel accesses that user doesn't have permission to */
1322+
long long acl_access_denied_tls_cert; /* Invalid channel accesses that user doesn't have permission to */
13231323
} aclInfo;
13241324

13251325
struct saveparam {

0 commit comments

Comments
 (0)