enforce SQL username check + return FALSE instead of bailout

3 files changed, 43 insertions, 27 deletions

diff --git a/execute.c b/execute.c
index 2f280b7..913a82b 100644
--- a/execute.c
+++ b/execute.c
@@ -1036,22 +1036,6 @@ int ih_fixusername(IH_HANDLER_PARAMS)
         postfix = SUHOSIN_G(sql_user_postfix);
         user_match = SUHOSIN_G(sql_user_match);
         
-        if ((prefix == NULL || prefix[0] == 0) && 
-                (postfix == NULL || postfix[0] == 0) &&
-                (user_match == NULL || user_match[0] == 0)) {
-                return (0);
-        }
-        
-        if (prefix == NULL) {
-                prefix = "";
-        }
-        if (postfix == NULL) {
-                postfix = "";
-        }
-        
-        prefix_len = strlen(prefix);
-        postfix_len = strlen(postfix);
-        
         arg_count = (unsigned long) *p;
 
         if (ht < (long) ih->arg1) {
@@ -1074,38 +1058,53 @@ int ih_fixusername(IH_HANDLER_PARAMS)
                 if (*cp < 32) {
                         suhosin_log(S_SQL, "SQL username contains invalid characters");
                         if (!SUHOSIN_G(simulation)) {
-                                suhosin_bailout(TSRMLS_C);
+                                RETVAL_FALSE;
+                                return (1);
                         }
                 }
                 cp++;
         }
 
-        MAKE_STD_ZVAL(my_user);
-        my_user->type = IS_STRING;
-        my_user->value.str.len = spprintf(&my_user->value.str.val, 0, "%s%s%s", prefix, user, postfix);
+        if ((prefix != NULL && prefix[0]) || (postfix != NULL && postfix[0])) {
+                if (prefix == NULL) {
+                        prefix = "";
+                }
+                if (postfix == NULL) {
+                        postfix = "";
+                }
+                prefix_len = strlen(prefix);
+                postfix_len = strlen(postfix);
+                
+                MAKE_STD_ZVAL(my_user);
+                my_user->type = IS_STRING;
+                my_user->value.str.len = spprintf(&my_user->value.str.val, 0, "%s%s%s", prefix, user, postfix);
         
-        if (user_match && user_match[0]) {
+                /* XXX: memory_leak? */
+                *arg = my_user; 
+                
                 len = Z_STRLEN_P(my_user);
                 user = Z_STRVAL_P(my_user);
+        }
+        
+        if (user_match && user_match[0]) {
 #ifdef HAVE_FNMATCH
                 if (fnmatch(user_match, user, 0) != 0) {
                         suhosin_log(S_SQL, "SQL username ('%s') does not match suhosin.sql.user_match ('%s')", user, user_match);
                         if (!SUHOSIN_G(simulation)) {
-                                suhosin_bailout(TSRMLS_C);
+                                RETVAL_FALSE;
+                                return (1);
                         }
                 }
 #else
 #warning no support for fnmatch() - setting suhosin.sql.user_match will always fail.
                 suhosin_log(S_SQL, "suhosin.sql.user_match specified, but system does not support fnmatch()");
                 if (!SUHOSIN_G(simulation)) {
-                        suhosin_bailout(TSRMLS_C);
+                        RETVAL_FALSE;
+                        return (1);
                 }
 #endif
         }
         
-        /* XXX: memory_leak? */
-        *arg = my_user; 
-         
         SDEBUG("function: %s - user: %s", ih->name, user);
 
         return (0);
diff --git a/tests/sql/mysqli_connect_invalid_username.phpt b/tests/sql/mysqli_connect_invalid_username.phpt
new file mode 100644
index 0000000..532254f
--- /dev/null
+++ b/tests/sql/mysqli_connect_invalid_username.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Mysqli connect with user_match not matching username
+--INI--
+extension=mysqli.so
+suhosin.log.stdout=32
+--SKIPIF--
+<?php
+include('skipifmysqli.inc');
+include('skipif.inc');
+?>
+--FILE--
+<?php
+include('connect.inc');
+$mysqli = new mysqli($host, "invalid\x01_username", $passwd, $db, $port, $socket);
+?>
+--EXPECTREGEX--
+ALERT - SQL username contains invalid characters.*
\ No newline at end of file
diff --git a/tests/sql/mysqli_user_match_ok.phpt b/tests/sql/mysqli_user_match_ok.phpt
index 4d7a438..a2ad832 100644
--- a/tests/sql/mysqli_user_match_ok.phpt
+++ b/tests/sql/mysqli_user_match_ok.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Mysqli connect with user_match not matching username
+Mysqli connect with user_match matching username
 --INI--
 extension=mysqli.so
 suhosin.sql.user_match=invalid_*