bus: when the first char a server receives isn't the NUL byte immediately fail

[elogind.git] / src / libsystemd-bus / bus-socket.c

diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c
index b9ef7c03720ea6f58e5d88961d7015ecbafc7f9f..82e683a9578724bd9acd2e5f459afb804ea01734 100644 (file)
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd-bus/bus-socket.c
@@ -235,7 +235,7 @@ static int verify_external_token(sd_bus *b, const char *p, size_t l) {
          * the owner of this bus wanted authentication he should have
          * checked SO_PEERCRED before even creating the bus object. */
 
          * the owner of this bus wanted authentication he should have
          * checked SO_PEERCRED before even creating the bus object. */
 

-        if (!b->ucred_valid)
+        if (!b->anonymous_auth && !b->ucred_valid)

                 return 0;
 
         if (l <= 0)
                 return 0;
 
         if (l <= 0)


@@ -258,7 +258,9 @@ static int verify_external_token(sd_bus *b, const char *p, size_t l) {
         if (r < 0)
                 return 0;
 
         if (r < 0)
                 return 0;
 

-        if (u != b->ucred.uid)
+        /* We ignore the passed value if anonymous authentication is
+         * on anyway. */
+        if (!b->anonymous_auth && u != b->ucred.uid)

                 return 0;
 
         return 1;
                 return 0;
 
         return 1;


@@ -311,13 +313,16 @@ static int bus_socket_auth_verify_server(sd_bus *b) {
 
         assert(b);
 
 
         assert(b);
 

-        if (b->rbuffer_size < 3)
+        if (b->rbuffer_size < 1)

                 return 0;
 
         /* First char must be a NUL byte */
         if (*(char*) b->rbuffer != 0)
                 return -EIO;
 
                 return 0;
 
         /* First char must be a NUL byte */
         if (*(char*) b->rbuffer != 0)
                 return -EIO;
 

+        if (b->rbuffer_size < 3)
+                return 0;
+

         /* Begin with the first line */
         if (b->auth_rbegin <= 0)
                 b->auth_rbegin = 1;
         /* Begin with the first line */
         if (b->auth_rbegin <= 0)
                 b->auth_rbegin = 1;