Changeset 30 for trunk/samba/source/nsswitch/winbindd_sid.c

Timestamp:

Apr 25, 2007, 11:44:55 AM (18 years ago)

Author:

Paul Smedley

Message:

Code updated to Samba 3.0.25rc2 level

File:

• trunk/samba/source/nsswitch/winbindd_sid.c (modified) (4 diffs)

trunk/samba/source/nsswitch/winbindd_sid.c

@@ -184 +184 @@
 }
 
+static void sid2uid_lookupsid_recv( void *private_data, BOOL success, 
+                                    const char *domain_name, 
+                                    const char *name, 
+                                    enum lsa_SidType type)
+{
+        struct winbindd_cli_state *state =
+                talloc_get_type_abort(private_data, struct winbindd_cli_state);
+        DOM_SID sid;
+
+        if (!success) {
+                DEBUG(5, ("sid2uid_lookupsid_recv Could not convert get sid type for %s\n",
+                          state->request.data.sid));
+                request_error(state);
+                return;
+        }
+
+        if ( (type!=SID_NAME_USER) && (type!=SID_NAME_COMPUTER) ) {
+                DEBUG(5,("sid2uid_lookupsid_recv: Sid %s is not a user or a computer.\n", 
+                         state->request.data.sid));
+                request_error(state);
+                return;         
+        }
+
+        if (!string_to_sid(&sid, state->request.data.sid)) {
+                DEBUG(1, ("sid2uid_lookupsid_recv: Could not get convert sid %s from string\n",
+                          state->request.data.sid));
+                request_error(state);
+                return;
+        }
+        
+        /* always use the async interface (may block) */
+        winbindd_sid2uid_async(state->mem_ctx, &sid, sid2uid_recv, state);
+}
+
 void winbindd_sid_to_uid(struct winbindd_cli_state *state)
 {
@@ -201 +235 @@
         }
 
-        /* always use the async interface (may block) */
-        winbindd_sid2uid_async(state->mem_ctx, &sid, sid2uid_recv, state);
+        /* Validate the SID as a user.  Hopefully this will hit cache.
+           Needed to prevent DoS by exhausting the uid allocation
+           range from random SIDs. */
+
+        winbindd_lookupsid_async( state->mem_ctx, &sid, sid2uid_lookupsid_recv, state );
 }
 
@@ -224 +261 @@
 }
 
+static void sid2gid_lookupsid_recv( void *private_data, BOOL success, 
+                                    const char *domain_name, 
+                                    const char *name, 
+                                    enum lsa_SidType type)
+{
+        struct winbindd_cli_state *state =
+                talloc_get_type_abort(private_data, struct winbindd_cli_state);
+        DOM_SID sid;
+
+        if (!success) {
+                DEBUG(5, ("sid2gid_lookupsid_recv: Could not convert get sid type for %s\n",
+                          state->request.data.sid));
+                request_error(state);
+                return;
+        }
+
+        if ( (type!=SID_NAME_DOM_GRP) &&
+             (type!=SID_NAME_ALIAS) && 
+             (type!=SID_NAME_WKN_GRP) ) 
+        {
+                DEBUG(5,("sid2gid_lookupsid_recv: Sid %s is not a group.\n", 
+                         state->request.data.sid));
+                request_error(state);
+                return;         
+        }
+
+        if (!string_to_sid(&sid, state->request.data.sid)) {
+                DEBUG(1, ("sid2gid_lookupsid_recv: Could not get convert sid %s from string\n",
+                          state->request.data.sid));
+                request_error(state);
+                return;
+        }
+        
+        /* always use the async interface (may block) */
+        winbindd_sid2gid_async(state->mem_ctx, &sid, sid2gid_recv, state);
+}
+
 void winbindd_sid_to_gid(struct winbindd_cli_state *state)
 {
@@ -241 +315 @@
         }
 
-        /* always use the async interface (may block) */
-        winbindd_sid2gid_async(state->mem_ctx, &sid, sid2gid_recv, state);
+        /* Validate the SID as a group.  Hopefully this will hit cache.
+           Needed to prevent DoS by exhausting the uid allocation
+           range from random SIDs. */
+
+        winbindd_lookupsid_async( state->mem_ctx, &sid, sid2gid_lookupsid_recv, state );        
 }