/* Convert a string */
-static void lookupsid_recv(void *private_data, bool success,
- const char *dom_name, const char *name,
- enum lsa_SidType type);
-
-void winbindd_lookupsid(struct winbindd_cli_state *state)
-{
- DOM_SID sid;
-
- /* Ensure null termination */
- state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
-
- DEBUG(3, ("[%5lu]: lookupsid %s\n", (unsigned long)state->pid,
- state->request.data.sid));
-
- if (!string_to_sid(&sid, state->request.data.sid)) {
- DEBUG(5, ("%s not a SID\n", state->request.data.sid));
- request_error(state);
- return;
- }
-
- winbindd_lookupsid_async(state->mem_ctx, &sid, lookupsid_recv, state);
-}
-
-static void lookupsid_recv(void *private_data, bool success,
- const char *dom_name, const char *name,
- enum lsa_SidType type)
-{
- struct winbindd_cli_state *state =
- talloc_get_type_abort(private_data, struct winbindd_cli_state);
-
- if (!success) {
- DEBUG(5, ("lookupsid returned an error\n"));
- request_error(state);
- return;
- }
-
- fstrcpy(state->response.data.name.dom_name, dom_name);
- fstrcpy(state->response.data.name.name, name);
- state->response.data.name.type = type;
- request_ok(state);
-}
-
/**
* Look up the SID for a qualified name.
**/
char *p;
/* Ensure null termination */
- state->request.data.name.dom_name[sizeof(state->request.data.name.dom_name)-1]='\0';
+ state->request->data.name.dom_name[sizeof(state->request->data.name.dom_name)-1]='\0';
/* Ensure null termination */
- state->request.data.name.name[sizeof(state->request.data.name.name)-1]='\0';
+ state->request->data.name.name[sizeof(state->request->data.name.name)-1]='\0';
/* cope with the name being a fully qualified name */
- p = strstr(state->request.data.name.name, lp_winbind_separator());
+ p = strstr(state->request->data.name.name, lp_winbind_separator());
if (p) {
*p = 0;
- name_domain = state->request.data.name.name;
+ name_domain = state->request->data.name.name;
name_user = p+1;
+ } else if ((p = strchr(state->request->data.name.name, '@')) != NULL) {
+ /* upn */
+ name_domain = p + 1;
+ *p = 0;
+ name_user = state->request->data.name.name;
} else {
- name_domain = state->request.data.name.dom_name;
- name_user = state->request.data.name.name;
+ name_domain = state->request->data.name.dom_name;
+ name_user = state->request->data.name.name;
}
DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid,
return;
}
- sid_to_string(state->response.data.sid.sid, sid);
- state->response.data.sid.type = type;
+ sid_to_fstring(state->response->data.sid.sid, sid);
+ state->response->data.sid.type = type;
request_ok(state);
return;
}
DOM_SID domain_sid;
/* Ensure null termination */
- state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
+ state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
- DEBUG(10, ("lookup_rids: %s\n", state->request.data.sid));
+ DEBUG(10, ("lookup_rids: %s\n", state->request->data.sid));
- if (!string_to_sid(&domain_sid, state->request.data.sid)) {
+ if (!string_to_sid(&domain_sid, state->request->data.sid)) {
DEBUG(5, ("Could not convert %s to SID\n",
- state->request.data.sid));
+ state->request->data.sid));
request_error(state);
return;
}
domain = find_lookup_domain_from_sid(&domain_sid);
if (domain == NULL) {
DEBUG(10, ("Could not find domain for name %s\n",
- state->request.domain_name));
+ state->request->domain_name));
request_error(state);
return;
}
{
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
+ struct dom_sid sid;
+
+ string_to_sid(&sid, state->request->data.sid);
if (!success) {
DEBUG(5, ("Could not convert sid %s\n",
- state->request.data.sid));
+ state->request->data.sid));
request_error(state);
return;
}
- state->response.data.uid = uid;
+ state->response->data.uid = uid;
request_ok(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));
+ 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;
}
+ if (!success) {
+ DEBUG(5, ("sid2uid_lookupsid_recv Could not convert get sid type for %s\n",
+ state->request->data.sid));
+ goto fail;
+ }
+
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;
+ state->request->data.sid));
+ goto fail;
}
- 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);
+ return;
+
+ fail:
+ /*
+ * We have to set the cache ourselves here, the child which is
+ * normally responsible was not queried yet.
+ */
+ idmap_cache_set_sid2uid(&sid, -1);
+ request_error(state);
+ return;
}
void winbindd_sid_to_uid(struct winbindd_cli_state *state)
{
DOM_SID sid;
+ uid_t uid;
+ bool expired;
/* Ensure null termination */
- state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
+ state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
DEBUG(3, ("[%5lu]: sid to uid %s\n", (unsigned long)state->pid,
- state->request.data.sid));
+ state->request->data.sid));
- if (!string_to_sid(&sid, state->request.data.sid)) {
+ if (!string_to_sid(&sid, state->request->data.sid)) {
DEBUG(1, ("Could not get convert sid %s from string\n",
- state->request.data.sid));
+ state->request->data.sid));
request_error(state);
return;
}
+ if (idmap_cache_find_sid2uid(&sid, &uid, &expired)) {
+ DEBUG(10, ("idmap_cache_find_sid2uid found %d%s\n",
+ (int)uid, expired ? " (expired)": ""));
+ if (expired && IS_DOMAIN_ONLINE(find_our_domain())) {
+ DEBUG(10, ("revalidating expired entry\n"));
+ goto backend;
+ }
+ if (uid == -1) {
+ DEBUG(10, ("Returning negative cache entry\n"));
+ request_error(state);
+ return;
+ }
+ DEBUG(10, ("Returning positive cache entry\n"));
+ state->response->data.uid = uid;
+ request_ok(state);
+ return;
+ }
+
/* Validate the SID as a user. Hopefully this will hit cache.
Needed to prevent DoS by exhausting the uid allocation
range from random SIDs. */
+ backend:
winbindd_lookupsid_async( state->mem_ctx, &sid, sid2uid_lookupsid_recv, state );
}
{
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
+ struct dom_sid sid;
+
+ string_to_sid(&sid, state->request->data.sid);
if (!success) {
DEBUG(5, ("Could not convert sid %s\n",
- state->request.data.sid));
+ state->request->data.sid));
request_error(state);
return;
}
- state->response.data.gid = gid;
+ state->response->data.gid = gid;
request_ok(state);
}
talloc_get_type_abort(private_data, struct winbindd_cli_state);
DOM_SID sid;
- if (!success) {
- DEBUG(5, ("sid2gid_lookupsid_recv: Could not get sid type for %s\n",
- state->request.data.sid));
+ 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;
}
+ if (!success) {
+ DEBUG(5, ("sid2gid_lookupsid_recv: Could not get sid type for %s\n",
+ state->request->data.sid));
+ goto fail;
+ }
+
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;
+ state->request->data.sid));
+ goto fail;
}
- 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);
+ return;
+
+ fail:
+ /*
+ * We have to set the cache ourselves here, the child which is
+ * normally responsible was not queried yet.
+ */
+ idmap_cache_set_sid2gid(&sid, -1);
+ request_error(state);
+ return;
}
void winbindd_sid_to_gid(struct winbindd_cli_state *state)
{
DOM_SID sid;
+ gid_t gid;
+ bool expired;
/* Ensure null termination */
- state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
+ state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
DEBUG(3, ("[%5lu]: sid to gid %s\n", (unsigned long)state->pid,
- state->request.data.sid));
+ state->request->data.sid));
- if (!string_to_sid(&sid, state->request.data.sid)) {
+ if (!string_to_sid(&sid, state->request->data.sid)) {
DEBUG(1, ("Could not get convert sid %s from string\n",
- state->request.data.sid));
+ state->request->data.sid));
request_error(state);
return;
}
+ if (idmap_cache_find_sid2gid(&sid, &gid, &expired)) {
+ DEBUG(10, ("idmap_cache_find_sid2gid found %d%s\n",
+ (int)gid, expired ? " (expired)": ""));
+ if (expired && IS_DOMAIN_ONLINE(find_our_domain())) {
+ DEBUG(10, ("revalidating expired entry\n"));
+ goto backend;
+ }
+ if (gid == -1) {
+ DEBUG(10, ("Returning negative cache entry\n"));
+ request_error(state);
+ return;
+ }
+ DEBUG(10, ("Returning positive cache entry\n"));
+ state->response->data.gid = gid;
+ request_ok(state);
+ return;
+ }
+
/* 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 );
+ backend:
+ winbindd_lookupsid_async( state->mem_ctx, &sid, sid2gid_lookupsid_recv,
+ state );
}
-static void sids2xids_recv(void *private_data, bool success, void *data, int len)
+static void set_mapping_recv(void *private_data, bool success)
{
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
if (!success) {
- DEBUG(5, ("Could not convert sids to xids\n"));
+ DEBUG(5, ("Could not set sid mapping\n"));
request_error(state);
return;
}
- state->response.extra_data.data = data;
- state->response.length = sizeof(state->response) + len;
request_ok(state);
}
-void winbindd_sids_to_unixids(struct winbindd_cli_state *state)
+void winbindd_set_mapping(struct winbindd_cli_state *state)
{
- DEBUG(3, ("[%5lu]: sids to xids\n", (unsigned long)state->pid));
+ struct id_map map;
+ DOM_SID sid;
+
+ DEBUG(3, ("[%5lu]: set id map\n", (unsigned long)state->pid));
+
+ if ( ! state->privileged) {
+ DEBUG(0, ("Only root is allowed to set mappings!\n"));
+ request_error(state);
+ return;
+ }
- winbindd_sids2xids_async(state->mem_ctx,
- state->request.extra_data.data,
- state->request.extra_len,
- sids2xids_recv, state);
+ if (!string_to_sid(&sid, state->request->data.dual_idmapset.sid)) {
+ DEBUG(1, ("Could not get convert sid %s from string\n",
+ state->request->data.sid));
+ request_error(state);
+ return;
+ }
+
+ map.sid = &sid;
+ map.xid.id = state->request->data.dual_idmapset.id;
+ map.xid.type = state->request->data.dual_idmapset.type;
+
+ winbindd_set_mapping_async(state->mem_ctx, &map,
+ set_mapping_recv, state);
}
-static void set_mapping_recv(void *private_data, bool success)
+static void remove_mapping_recv(void *private_data, bool success)
{
struct winbindd_cli_state *state =
talloc_get_type_abort(private_data, struct winbindd_cli_state);
if (!success) {
- DEBUG(5, ("Could not set sid mapping\n"));
+ DEBUG(5, ("Could not remove sid mapping\n"));
request_error(state);
return;
}
request_ok(state);
}
-void winbindd_set_mapping(struct winbindd_cli_state *state)
+void winbindd_remove_mapping(struct winbindd_cli_state *state)
{
struct id_map map;
DOM_SID sid;
- DEBUG(3, ("[%5lu]: set id map\n", (unsigned long)state->pid));
+ DEBUG(3, ("[%5lu]: remove id map\n", (unsigned long)state->pid));
if ( ! state->privileged) {
- DEBUG(0, ("Only root is allowed to set mappings!\n"));
+ DEBUG(0, ("Only root is allowed to remove mappings!\n"));
request_error(state);
return;
}
- if (!string_to_sid(&sid, state->request.data.dual_idmapset.sid)) {
+ if (!string_to_sid(&sid, state->request->data.dual_idmapset.sid)) {
DEBUG(1, ("Could not get convert sid %s from string\n",
- state->request.data.sid));
+ state->request->data.sid));
request_error(state);
return;
}
map.sid = &sid;
- map.xid.id = state->request.data.dual_idmapset.id;
- map.xid.type = state->request.data.dual_idmapset.type;
+ map.xid.id = state->request->data.dual_idmapset.id;
+ map.xid.type = state->request->data.dual_idmapset.type;
- winbindd_set_mapping_async(state->mem_ctx, &map,
- set_mapping_recv, state);
+ winbindd_remove_mapping_async(state->mem_ctx, &map,
+ remove_mapping_recv, state);
}
static void set_hwm_recv(void *private_data, bool success)
return;
}
- xid.id = state->request.data.dual_idmapset.id;
- xid.type = state->request.data.dual_idmapset.type;
+ xid.id = state->request->data.dual_idmapset.id;
+ xid.type = state->request->data.dual_idmapset.type;
winbindd_set_hwm_async(state->mem_ctx, &xid, set_hwm_recv, state);
}
/* Convert a uid to a sid */
-static void uid2sid_recv(void *private_data, bool success, const char *sid)
+static void uid2sid_recv(void *private_data, bool success, const char *sidstr)
{
struct winbindd_cli_state *state =
(struct winbindd_cli_state *)private_data;
+ struct dom_sid sid;
- if (success) {
- DEBUG(10,("uid2sid: uid %lu has sid %s\n",
- (unsigned long)(state->request.data.uid), sid));
- fstrcpy(state->response.data.sid.sid, sid);
- state->response.data.sid.type = SID_NAME_USER;
- request_ok(state);
+ if (!success || !string_to_sid(&sid, sidstr)) {
+ ZERO_STRUCT(sid);
+ idmap_cache_set_sid2uid(&sid, state->request->data.uid);
+ request_error(state);
return;
}
- request_error(state);
+ DEBUG(10,("uid2sid: uid %lu has sid %s\n",
+ (unsigned long)(state->request->data.uid), sidstr));
+
+ idmap_cache_set_sid2uid(&sid, state->request->data.uid);
+ fstrcpy(state->response->data.sid.sid, sidstr);
+ state->response->data.sid.type = SID_NAME_USER;
+ request_ok(state);
return;
}
void winbindd_uid_to_sid(struct winbindd_cli_state *state)
{
+ struct dom_sid sid;
+ bool expired;
+
DEBUG(3, ("[%5lu]: uid to sid %lu\n", (unsigned long)state->pid,
- (unsigned long)state->request.data.uid));
+ (unsigned long)state->request->data.uid));
+
+ if (idmap_cache_find_uid2sid(state->request->data.uid, &sid,
+ &expired)) {
+ DEBUG(10, ("idmap_cache_find_uid2sid found %d%s\n",
+ (int)state->request->data.uid,
+ expired ? " (expired)": ""));
+ if (expired && IS_DOMAIN_ONLINE(find_our_domain())) {
+ DEBUG(10, ("revalidating expired entry\n"));
+ goto backend;
+ }
+ if (is_null_sid(&sid)) {
+ DEBUG(10, ("Returning negative cache entry\n"));
+ request_error(state);
+ return;
+ }
+ DEBUG(10, ("Returning positive cache entry\n"));
+ sid_to_fstring(state->response->data.sid.sid, &sid);
+ request_ok(state);
+ return;
+ }
/* always go via the async interface (may block) */
- winbindd_uid2sid_async(state->mem_ctx, state->request.data.uid, uid2sid_recv, state);
+ backend:
+ winbindd_uid2sid_async(state->mem_ctx, state->request->data.uid, uid2sid_recv, state);
}
/* Convert a gid to a sid */
-static void gid2sid_recv(void *private_data, bool success, const char *sid)
+static void gid2sid_recv(void *private_data, bool success, const char *sidstr)
{
struct winbindd_cli_state *state =
(struct winbindd_cli_state *)private_data;
+ struct dom_sid sid;
- if (success) {
- DEBUG(10,("gid2sid: gid %lu has sid %s\n",
- (unsigned long)(state->request.data.gid), sid));
- fstrcpy(state->response.data.sid.sid, sid);
- state->response.data.sid.type = SID_NAME_DOM_GRP;
- request_ok(state);
+ if (!success || !string_to_sid(&sid, sidstr)) {
+ ZERO_STRUCT(sid);
+ idmap_cache_set_sid2gid(&sid, state->request->data.gid);
+ request_error(state);
return;
}
+ DEBUG(10,("gid2sid: gid %lu has sid %s\n",
+ (unsigned long)(state->request->data.gid), sidstr));
- request_error(state);
+ idmap_cache_set_sid2gid(&sid, state->request->data.gid);
+ fstrcpy(state->response->data.sid.sid, sidstr);
+ state->response->data.sid.type = SID_NAME_DOM_GRP;
+ request_ok(state);
return;
}
void winbindd_gid_to_sid(struct winbindd_cli_state *state)
{
+ struct dom_sid sid;
+ bool expired;
+
DEBUG(3, ("[%5lu]: gid to sid %lu\n", (unsigned long)state->pid,
- (unsigned long)state->request.data.gid));
+ (unsigned long)state->request->data.gid));
+
+ if (idmap_cache_find_gid2sid(state->request->data.gid, &sid,
+ &expired)) {
+ DEBUG(10, ("idmap_cache_find_gid2sid found %d%s\n",
+ (int)state->request->data.gid,
+ expired ? " (expired)": ""));
+ if (expired && IS_DOMAIN_ONLINE(find_our_domain())) {
+ DEBUG(10, ("revalidating expired entry\n"));
+ goto backend;
+ }
+ if (is_null_sid(&sid)) {
+ DEBUG(10, ("Returning negative cache entry\n"));
+ request_error(state);
+ return;
+ }
+ DEBUG(10, ("Returning positive cache entry\n"));
+ sid_to_fstring(state->response->data.sid.sid, &sid);
+ request_ok(state);
+ return;
+ }
/* always use async calls (may block) */
- winbindd_gid2sid_async(state->mem_ctx, state->request.data.gid, gid2sid_recv, state);
+ backend:
+ winbindd_gid2sid_async(state->mem_ctx, state->request->data.gid, gid2sid_recv, state);
}
void winbindd_allocate_uid(struct winbindd_cli_state *state)
if (!NT_STATUS_IS_OK(idmap_allocate_uid(&xid))) {
return WINBINDD_ERROR;
}
- state->response.data.uid = xid.id;
+ state->response->data.uid = xid.id;
return WINBINDD_OK;
}
if (!NT_STATUS_IS_OK(idmap_allocate_gid(&xid))) {
return WINBINDD_ERROR;
}
- state->response.data.gid = xid.id;
+ state->response->data.gid = xid.id;
return WINBINDD_OK;
}
-
-static void dump_maps_recv(void *private_data, bool success)
-{
- struct winbindd_cli_state *state =
- talloc_get_type_abort(private_data, struct winbindd_cli_state);
-
- if (!success) {
- DEBUG(5, ("Could not dump maps\n"));
- request_error(state);
- return;
- }
-
- request_ok(state);
-}
-
-void winbindd_dump_maps(struct winbindd_cli_state *state)
-{
- const char *logfile;
-
- if ( ! state->privileged) {
- DEBUG(0, ("Only root is allowed to ask for an idmap dump!\n"));
- request_error(state);
- return;
- }
-
- DEBUG(3, ("[%5lu]: dump maps\n", (unsigned long)state->pid));
-
- logfile = talloc_strndup(state->mem_ctx,
- (const char *)state->request.extra_data.data,
- state->request.extra_len);
- if (!logfile) {
- request_error(state);
- return;
- }
-
- winbindd_dump_maps_async(state->mem_ctx, logfile,
- dump_maps_recv, state);
-}
-
git.samba.org / ira / wip.git / blobdiff