mirror of
https://github.com/samba-team/samba.git
synced 2025-01-06 13:18:07 +03:00
e9e6af5951
Fix escaping of DN components and filters around the code
Add some notes to commandline help messages about how to pass DNs
revert jra's "concistency" commit to nsswitch/winbindd_ads.c, as it was
incorrect.
The 2 functions use DNs in different ways.
- lookup_usergroups_member() uses the DN in a search filter,
and must use the filter escaping function to escape it
Escaping filters that include escaped DNs ("\," becomes "\5c,") is the
correct way to do it (tested against W2k3).
- lookup_usergroups_memberof() instead uses the DN ultimately as a base dn.
Both functions do NOT need any DN escaping function as DNs can't be reliably
escaped when in a string form, intead each single RDN value must be escaped
separately.
DNs coming from other ldap calls (like ads_get_dn()), do not need escaping as
they come already escaped on the wire and passed as is by the ldap libraries
DN filtering has been tested.
For example now it is possible to do something like:
'net ads add user joe#5' as now the '#' character is correctly escaped when
building the DN, previously such a call failed with Invalid DN Syntax.
Simo.
(This used to be commit 5b4838f62a
)
311 lines
9.1 KiB
C
311 lines
9.1 KiB
C
/*
|
|
Unix SMB/CIFS mplementation.
|
|
LDAP protocol helper functions for SAMBA
|
|
Copyright (C) Jean François Micouleau 1998
|
|
Copyright (C) Gerald Carter 2001-2003
|
|
Copyright (C) Shahms King 2001
|
|
Copyright (C) Andrew Bartlett 2002-2003
|
|
Copyright (C) Stefan (metze) Metzmacher 2002-2003
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
#include "includes.h"
|
|
#include "smbldap.h"
|
|
|
|
/**********************************************************************
|
|
Add the account-policies below the sambaDomain object to LDAP,
|
|
*********************************************************************/
|
|
|
|
static NTSTATUS add_new_domain_account_policies(struct smbldap_state *ldap_state,
|
|
const char *domain_name)
|
|
{
|
|
NTSTATUS ntstatus = NT_STATUS_UNSUCCESSFUL;
|
|
int i, rc;
|
|
uint32 policy_default;
|
|
const char *policy_attr = NULL;
|
|
pstring dn;
|
|
LDAPMod **mods = NULL;
|
|
char *escape_domain_name;
|
|
|
|
DEBUG(3,("add_new_domain_account_policies: Adding new account policies for domain\n"));
|
|
|
|
escape_domain_name = escape_rdn_val_string_alloc(domain_name);
|
|
if (!escape_domain_name) {
|
|
DEBUG(0, ("Out of memory!\n"));
|
|
return NT_STATUS_NO_MEMORY;
|
|
}
|
|
|
|
pstr_sprintf(dn, "%s=%s,%s",
|
|
get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN),
|
|
escape_domain_name, lp_ldap_suffix());
|
|
|
|
SAFE_FREE(escape_domain_name);
|
|
|
|
for (i=1; decode_account_policy_name(i) != NULL; i++) {
|
|
|
|
pstring val;
|
|
|
|
policy_attr = get_account_policy_attr(i);
|
|
if (!policy_attr) {
|
|
DEBUG(0,("add_new_domain_account_policies: ops. no policy!\n"));
|
|
continue;
|
|
}
|
|
|
|
if (!account_policy_get_default(i, &policy_default)) {
|
|
DEBUG(0,("add_new_domain_account_policies: failed to get default account policy\n"));
|
|
return ntstatus;
|
|
}
|
|
|
|
DEBUG(10,("add_new_domain_account_policies: adding \"%s\" with value: %d\n", policy_attr, policy_default));
|
|
|
|
pstr_sprintf(val, "%d", policy_default);
|
|
|
|
smbldap_set_mod( &mods, LDAP_MOD_REPLACE, policy_attr, val);
|
|
|
|
rc = smbldap_modify(ldap_state, dn, mods);
|
|
|
|
if (rc!=LDAP_SUCCESS) {
|
|
char *ld_error = NULL;
|
|
ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING, &ld_error);
|
|
DEBUG(1,("add_new_domain_account_policies: failed to add account policies to dn= %s with: %s\n\t%s\n",
|
|
dn, ldap_err2string(rc),
|
|
ld_error ? ld_error : "unknown"));
|
|
SAFE_FREE(ld_error);
|
|
ldap_mods_free(mods, True);
|
|
return ntstatus;
|
|
}
|
|
}
|
|
|
|
ldap_mods_free(mods, True);
|
|
|
|
return NT_STATUS_OK;
|
|
}
|
|
|
|
/**********************************************************************
|
|
Add the sambaDomain to LDAP, so we don't have to search for this stuff
|
|
again. This is a once-add operation for now.
|
|
|
|
TODO: Add other attributes, and allow modification.
|
|
*********************************************************************/
|
|
|
|
static NTSTATUS add_new_domain_info(struct smbldap_state *ldap_state,
|
|
const char *domain_name)
|
|
{
|
|
fstring sid_string;
|
|
fstring algorithmic_rid_base_string;
|
|
pstring filter, dn;
|
|
LDAPMod **mods = NULL;
|
|
int rc;
|
|
LDAPMessage *result = NULL;
|
|
int num_result;
|
|
const char **attr_list;
|
|
char *escape_domain_name;
|
|
|
|
/* escape for filter */
|
|
escape_domain_name = escape_ldap_string_alloc(domain_name);
|
|
if (!escape_domain_name) {
|
|
DEBUG(0, ("Out of memory!\n"));
|
|
return NT_STATUS_NO_MEMORY;
|
|
}
|
|
|
|
slprintf (filter, sizeof (filter) - 1, "(&(%s=%s)(objectclass=%s))",
|
|
get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN),
|
|
escape_domain_name, LDAP_OBJ_DOMINFO);
|
|
|
|
SAFE_FREE(escape_domain_name);
|
|
|
|
attr_list = get_attr_list( NULL, dominfo_attr_list );
|
|
rc = smbldap_search_suffix(ldap_state, filter, attr_list, &result);
|
|
TALLOC_FREE( attr_list );
|
|
|
|
if (rc != LDAP_SUCCESS) {
|
|
return NT_STATUS_UNSUCCESSFUL;
|
|
}
|
|
|
|
num_result = ldap_count_entries(ldap_state->ldap_struct, result);
|
|
|
|
if (num_result > 1) {
|
|
DEBUG (0, ("add_new_domain_info: More than domain with that name exists: bailing "
|
|
"out!\n"));
|
|
ldap_msgfree(result);
|
|
return NT_STATUS_UNSUCCESSFUL;
|
|
}
|
|
|
|
/* Check if we need to add an entry */
|
|
DEBUG(3,("add_new_domain_info: Adding new domain\n"));
|
|
|
|
/* this time escape for DN */
|
|
escape_domain_name = escape_rdn_val_string_alloc(domain_name);
|
|
if (!escape_domain_name) {
|
|
DEBUG(0, ("Out of memory!\n"));
|
|
return NT_STATUS_NO_MEMORY;
|
|
}
|
|
|
|
pstr_sprintf(dn, "%s=%s,%s",
|
|
get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN),
|
|
escape_domain_name, lp_ldap_suffix());
|
|
|
|
SAFE_FREE(escape_domain_name);
|
|
|
|
/* Free original search */
|
|
ldap_msgfree(result);
|
|
|
|
/* make the changes - the entry *must* not already have samba
|
|
* attributes */
|
|
|
|
smbldap_set_mod(&mods, LDAP_MOD_ADD,
|
|
get_attr_key2string(dominfo_attr_list,
|
|
LDAP_ATTR_DOMAIN),
|
|
domain_name);
|
|
|
|
/* If we don't have an entry, then ask secrets.tdb for what it thinks.
|
|
It may choose to make it up */
|
|
|
|
sid_to_string(sid_string, get_global_sam_sid());
|
|
smbldap_set_mod(&mods, LDAP_MOD_ADD,
|
|
get_attr_key2string(dominfo_attr_list,
|
|
LDAP_ATTR_DOM_SID),
|
|
sid_string);
|
|
|
|
slprintf(algorithmic_rid_base_string,
|
|
sizeof(algorithmic_rid_base_string) - 1, "%i",
|
|
algorithmic_rid_base());
|
|
smbldap_set_mod(&mods, LDAP_MOD_ADD,
|
|
get_attr_key2string(dominfo_attr_list,
|
|
LDAP_ATTR_ALGORITHMIC_RID_BASE),
|
|
algorithmic_rid_base_string);
|
|
smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectclass", LDAP_OBJ_DOMINFO);
|
|
|
|
/* add the sambaNextUserRid attributes. */
|
|
|
|
{
|
|
uint32 rid = BASE_RID;
|
|
fstring rid_str;
|
|
|
|
fstr_sprintf( rid_str, "%i", rid );
|
|
DEBUG(10,("add_new_domain_info: setting next available user rid [%s]\n", rid_str));
|
|
smbldap_set_mod(&mods, LDAP_MOD_ADD,
|
|
get_attr_key2string(dominfo_attr_list,
|
|
LDAP_ATTR_NEXT_USERRID),
|
|
rid_str);
|
|
}
|
|
|
|
|
|
rc = smbldap_add(ldap_state, dn, mods);
|
|
|
|
if (rc!=LDAP_SUCCESS) {
|
|
char *ld_error = NULL;
|
|
ldap_get_option(ldap_state->ldap_struct,
|
|
LDAP_OPT_ERROR_STRING, &ld_error);
|
|
DEBUG(1,("add_new_domain_info: failed to add domain dn= %s with: %s\n\t%s\n",
|
|
dn, ldap_err2string(rc),
|
|
ld_error?ld_error:"unknown"));
|
|
SAFE_FREE(ld_error);
|
|
|
|
ldap_mods_free(mods, True);
|
|
return NT_STATUS_UNSUCCESSFUL;
|
|
}
|
|
|
|
DEBUG(2,("add_new_domain_info: added: domain = %s in the LDAP database\n", domain_name));
|
|
ldap_mods_free(mods, True);
|
|
return NT_STATUS_OK;
|
|
}
|
|
|
|
/**********************************************************************
|
|
Search for the domain info entry
|
|
*********************************************************************/
|
|
|
|
NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state,
|
|
LDAPMessage ** result, const char *domain_name,
|
|
BOOL try_add)
|
|
{
|
|
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
|
|
pstring filter;
|
|
int rc;
|
|
const char **attr_list;
|
|
int count;
|
|
char *escape_domain_name;
|
|
|
|
escape_domain_name = escape_ldap_string_alloc(domain_name);
|
|
if (!escape_domain_name) {
|
|
DEBUG(0, ("Out of memory!\n"));
|
|
return NT_STATUS_NO_MEMORY;
|
|
}
|
|
|
|
pstr_sprintf(filter, "(&(objectClass=%s)(%s=%s))",
|
|
LDAP_OBJ_DOMINFO,
|
|
get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN),
|
|
escape_domain_name);
|
|
|
|
SAFE_FREE(escape_domain_name);
|
|
|
|
DEBUG(2, ("smbldap_search_domain_info: Searching for:[%s]\n", filter));
|
|
|
|
attr_list = get_attr_list( NULL, dominfo_attr_list );
|
|
rc = smbldap_search_suffix(ldap_state, filter, attr_list , result);
|
|
TALLOC_FREE( attr_list );
|
|
|
|
if (rc != LDAP_SUCCESS) {
|
|
DEBUG(2,("smbldap_search_domain_info: Problem during LDAPsearch: %s\n", ldap_err2string (rc)));
|
|
DEBUG(2,("smbldap_search_domain_info: Query was: %s, %s\n", lp_ldap_suffix(), filter));
|
|
goto failed;
|
|
}
|
|
|
|
count = ldap_count_entries(ldap_state->ldap_struct, *result);
|
|
|
|
if (count == 1)
|
|
return NT_STATUS_OK;
|
|
|
|
ldap_msgfree(*result);
|
|
*result = NULL;
|
|
|
|
if (count < 1) {
|
|
|
|
DEBUG(3, ("smbldap_search_domain_info: Got no domain info entries for domain\n"));
|
|
|
|
if (!try_add)
|
|
goto failed;
|
|
|
|
status = add_new_domain_info(ldap_state, domain_name);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
DEBUG(0, ("smbldap_search_domain_info: Adding domain info for %s failed with %s\n",
|
|
domain_name, nt_errstr(status)));
|
|
goto failed;
|
|
}
|
|
|
|
status = add_new_domain_account_policies(ldap_state, domain_name);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
DEBUG(0, ("smbldap_search_domain_info: Adding domain account policies for %s failed with %s\n",
|
|
domain_name, nt_errstr(status)));
|
|
goto failed;
|
|
}
|
|
|
|
return smbldap_search_domain_info(ldap_state, result, domain_name, False);
|
|
|
|
}
|
|
|
|
if (count > 1 ) {
|
|
|
|
DEBUG(0, ("smbldap_search_domain_info: Got too many (%d) domain info entries for domain %s\n",
|
|
count, domain_name));
|
|
goto failed;
|
|
}
|
|
|
|
failed:
|
|
return status;
|
|
}
|