Skip to content
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

Jump to bottom

introducing suhosin.log.use-x-request-id #115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

introducing suhosin.log.use-x-request-id #115

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
90f2333
introduced suhosin.log.use-x-request-id
mostafahussein Jul 8, 2017
8e03f16
fix variable name
mostafahussein Jul 8, 2017
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
17 changes: 15 additions & 2 deletions log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
char buf[5000] = {0};
char error[5000] = {0};
char *ip_address;
char *request_id;
char *fname;
char *alertstring;
int lineno = 0;
Expand Down Expand Up @@ -141,6 +142,18 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
ip_address = "REMOTE_ADDR not set";
}
}

if (SUHOSIN_G(log_use_x_request_id)) {
request_id = suhosin_getenv("HTTP_X_REQUEST_ID", 40 TSRMLS_CC);
if (request_id == NULL) {
request_id = "X-REQUEST-ID not set";
}
} else {
request_id = suhosin_getenv("UNIQUE_ID", 40 TSRMLS_CC);
if (request_id == NULL) {
request_id = "UNIQUE_ID not set";
}
}


va_start(ap, fmt);
Expand Down Expand Up @@ -177,13 +190,13 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
lineno = zend_get_executed_lineno(TSRMLS_C);
fname = (char *)zend_get_executed_filename(TSRMLS_C);
}
ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', attacker-request-id '%s', file '%s', line %u)", alertstring, error, ip_address, request_id, fname, lineno);
} else {
fname = suhosin_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
if (fname==NULL) {
fname = "unknown";
}
ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s')", alertstring, error, ip_address, fname);
ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', attacker-request-id '%s', file '%s')", alertstring, error, ip_address, request_id, fname);
}

/* Syslog-Logging disabled? */
Expand Down
1 change: 1 addition & 0 deletions php_suhosin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)

/* log */
zend_bool log_use_x_forwarded_for;
zend_bool log_use_x_request_id;
long log_syslog;
long log_syslog_facility;
long log_syslog_priority;
Expand Down
1 change: 1 addition & 0 deletions suhosin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,7 @@ static zend_ini_entry shared_ini_entries[] = {
ZEND_INI_ENTRY("suhosin.log.script", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_script)
ZEND_INI_ENTRY("suhosin.log.script.name", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_scriptname)
STD_ZEND_INI_BOOLEAN("suhosin.log.use-x-forwarded-for", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateLogBool, log_use_x_forwarded_for, zend_suhosin_globals, suhosin_globals)
STD_ZEND_INI_BOOLEAN("suhosin.log.use-x-request-id", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateLogBool, log_use_x_request_id, zend_suhosin_globals, suhosin_globals)
ZEND_INI_ENTRY("suhosin.log.phpscript", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_phpscript)
STD_ZEND_INI_ENTRY("suhosin.log.phpscript.name", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateLogString, log_phpscriptname, zend_suhosin_globals, suhosin_globals)
ZEND_INI_ENTRY("suhosin.log.file", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_file)
Expand Down
14 changes: 14 additions & 0 deletions suhosin.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,20 @@
;suhosin.log.use-x-forwarded-for = Off
;
;
; suhosin.log.use-x-request-id
; ----------------------------
;
; * Type: Boolean
; * Default: Off
;
; When the Suhosin logs an error the log message also contains the Request ID of
; the attacker. Usually this Request ID is retrieved from the UNIQUE_ID SAPI
; environment variable. Also X-Request-ID HTTP header can be used if available.
; With this option enabled you will provided with a better way in order
; trace Suhosin issues.
;
;suhosin.log.use.x-request-id = Off
;
; ================
; Executor Options
; ================
Expand Down