Skip to content

[202305] Fix TACACS local accounting disabled when debug flag disabled. #19061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2024
Merged

[202305] Fix TACACS local accounting disabled when debug flag disabled. #19061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca0c815
[TACACS] Ignore TACACS accounting trace log when debug disabled. (#16…
liuh-80 Jan 23, 2024
fc2929d
Fix tacacs local accounting break. (#18357)
liuh-80 Mar 21, 2024
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
16 changes: 13 additions & 3 deletions src/tacacs/audisp/patches/0002-Remove-user-secret-from-accounting-log.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ Subject: [PATCH] Remove user secret from accounting log.
regex_helper.h | 17 +++
sudoers_helper.c | 250 +++++++++++++++++++++++++++++++++++++++
sudoers_helper.h | 18 +++
trace.c | 21 ++++
trace.c | 31 +++++
trace.h | 10 ++
unittest/Makefile | 21 ++++
unittest/mock.h | 17 +++
unittest/mock_helper.c | 65 ++++++++++
unittest/mock_helper.h | 48 ++++++++
unittest/password_test.c | 199 +++++++++++++++++++++++++++++++
unittest/sudoers | 5 +
17 files changed, 931 insertions(+), 4 deletions(-)
17 files changed, 941 insertions(+), 4 deletions(-)
create mode 100644 password.c
create mode 100644 password.h
create mode 100644 regex_helper.c
Expand Down Expand Up @@ -700,7 +700,7 @@ new file mode 100644
index 0000000..44bbbc7
--- /dev/null
+++ b/trace.c
@@ -0,0 +1,21 @@
@@ -0,0 +1,31 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
Expand All @@ -709,9 +709,19 @@ index 0000000..44bbbc7
+
+#include "trace.h"
+
+/* Tacacs+ support lib */
+#include <libtac/support.h>
+
+/* Tacacs control flag */
+extern int tacacs_ctrl;
+
+/* Output trace log. */
+void trace(const char *format, ...)
+{
+ if ((tacacs_ctrl & PAM_TAC_DEBUG) == 0) {
+ return;
+ }
+
+ // convert log to a string because va args resoursive issue:
+ // http://www.c-faq.com/varargs/handoff.html
+ char logBuffer[MAX_LINE_SIZE];
Expand Down
4 changes: 2 additions & 2 deletions src/tacacs/audisp/patches/0003-Add-local-accounting.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ index 0000000..e23acec
+#include "trace.h"
+
+/* Accounting log format. */
+#define ACCOUNTING_LOG_FORMAT "Accounting: user: %s, tty: %s, host: %s, command: %s, type: %d, task ID: %d"
+#define ACCOUNTING_LOG_FORMAT "Audisp-tacplus: Accounting: user: %s, tty: %s, host: %s, command: %s, type: %d, task ID: %d"
+
+/* Write the accounting information to syslog. */
+void accounting_to_syslog(char *user, char *tty, char *host, char *cmdmsg, int type, uint16_t task_id)
+{
+ trace(ACCOUNTING_LOG_FORMAT, user, tty, host, cmdmsg, type, task_id);
+ syslog(LOG_INFO, ACCOUNTING_LOG_FORMAT, user, tty, host, cmdmsg, type, task_id);
+}
\ No newline at end of file
diff --git a/local_accounting.h b/local_accounting.h
Expand Down
Loading