Bring legacy up to date with master

ChainsDD · ChainsDD · commit b9a7e7b47623 · 2011-10-22T19:41:06.000+01:00
diff --git a/activity.cpp b/activity.cpp
@@ -80,13 +80,18 @@ int send_intent(struct su_initiator *from, struct su_request *to, const char *so
         int oldPos = data.dataPosition();
         data.writeInt32(0x4C444E42); // 'B' 'N' 'D' 'L'
         { /* writeMapInternal */
-            data.writeInt32(6); /* writeMapInternal - size */
+            data.writeInt32(7); /* writeMapInternal - size */
 
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("caller_uid"));
             data.writeInt32(VAL_INTEGER);
             data.writeInt32(from->uid);
 
+            data.writeInt32(VAL_STRING);
+            data.writeString16(String16("caller_bin"));
+            data.writeInt32(VAL_STRING);
+            data.writeString16(String16(from->bin));
+
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("desired_uid"));
             data.writeInt32(VAL_INTEGER);
diff --git a/su.c b/su.c
@@ -48,7 +48,7 @@ extern char* _mktemp(char*); /* mktemp doesn't link right.  Don't ask me why. */
 extern sqlite3 *database_init();
 extern int database_check(sqlite3*, struct su_initiator*, struct su_request*);
 
-/* Not lazy anymore, just need these in too many places */
+/* Still lazt, will fix this */
 static char *socket_path = NULL;
 static sqlite3 *db = NULL;
 
@@ -318,7 +318,8 @@ int main(int argc, char *argv[])
             }
         } else if (!strcmp(argv[i], "-s") || !strcmp(argv[i], "--shell")) {
             if (++i < argc) {
-                strcpy(shell, argv[i]);
+                strncpy(shell, argv[i], sizeof(shell));
+                shell[sizeof(shell) - 1] = 0;
             } else {
                 usage();
             }
@@ -351,9 +352,11 @@ int main(int argc, char *argv[])
         }
     }
 
-    from_init(&su_from);
+    if (from_init(&su_from) < 0) {
+        deny();
+    }
 
-    if (su_from.uid == AID_ROOT)
+    if (su_from.uid == AID_ROOT || su_from.uid == AID_SHELL)
         allow(shell);
 
     if (stat(REQUESTOR_DATA_PATH, &st) < 0) {
@@ -370,14 +373,14 @@ int main(int argc, char *argv[])
 
     req_uid = st.st_uid;
 
-    if (from_init(&su_from) < 0) {
-        deny();
-    }
-
     if (mkdir(REQUESTOR_CACHE_PATH, 0771) >= 0) {
         chown(REQUESTOR_CACHE_PATH, req_uid, req_uid);
     }
 
+    setgroups(0, NULL);
+    setegid(st.st_gid);
+    seteuid(st.st_uid);
+
     LOGE("sudb - Opening database");
     db = database_init();
     if (!db) {
@@ -391,14 +394,15 @@ int main(int argc, char *argv[])
         // Close the database, we're done with it. If it stays open,
         // it will cause problems
         sqlite3_close(db);
+        db = NULL;
         LOGE("sudb - Database closed");
     }
 
     switch (dballow) {
-        case DB_DENY: LOGE("denying"); deny();
-        case DB_ALLOW: LOGE("allowing"); allow(shell);
-        case DB_INTERACTIVE: LOGE("asking"); break;
-        default: LOGE("default, denying"); deny();
+        case DB_DENY: deny();
+        case DB_ALLOW: allow(shell);
+        case DB_INTERACTIVE: break;
+        default: deny();
     }
 
     socket_serv_fd = socket_create_temp(req_uid);
diff --git a/su.h b/su.h
@@ -32,8 +32,8 @@
 
 #define SOCKET_PATH_TEMPLATE REQUESTOR_CACHE_PATH "/.socketXXXXXX"
 
-#define VERSION "3.0l"
-#define VERSION_CODE 11
+#define VERSION "3.0.1l"
+#define VERSION_CODE 12
 
 #define DATABASE_VERSION 6
 
