Introduce reading passwd/group entries from SAM/AD. Introduce
/etc/nsswitch.conf file to configure it. * Makefile.in (DLL_OFILES): Add ldap.o. * autoload.cc: Import ldap functions from wldap32.dll. (DsEnumerateDomainTrustsW): Import. (NetGroupGetInfo): Import. * cygheap.h (class cygheap_domain_info): New class to keep global domain info. (class cygheap_pwdgrp): New class to keep passwd/group caches and configuration info from /etc/nssswitch.conf. (struct init_cygheap): Add cygheap_domain_info member "dom" and cygheap_pwdgrp member "pg". * cygtls.h (struct _local_storage): Remove unused member "res". Rearrange slightly, Add members pwbuf and grbuf to implement non-caching passwd/group fetching from SAM/AD. Make pw_pos and pw_pos unsigned. * fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Add RFC 2307 uid/gid mapping. * fhandler_process.cc: Drop including pwdgrp.h. * fhandler_procsysvipc.cc: Ditto. * fhandler_registry.cc (fhandler_registry::fstat): Set key uid/gid to ILLEGAL_UID/ILLEGAL_GID rather than UNKNOWN_UID/UNKNOWN_GID. * grp.cc (group_buf): Drop. (gr): Drop. (pwdgrp::parse_group): Fill pg_grp. (pwdgrp::read_group): Remove. (pwdgrp::init_grp): New method. (pwdgrp::prep_tls_grbuf): New method. (pwdgrp::find_group): New methods. (internal_getgrsid): Convert to call new pwdgrp methods. (internal_getgrnam): Ditto. (internal_getgrgid): Ditto. (getgrgid_r): Drop 2nd parameter from internal_getgrgid call. (getgrgid32): Ditto. (getgrnam_r): Ditto for internal_getgrnam. (getgrnam32): Ditto. (getgrent32): Convert to call new pwdgrp methods. (internal_getgrent): Remove. (internal_getgroups): Simplify, especially drop calls to internal_getgrent. * ldap.cc: New file implementing cyg_ldap class for LDAP access to AD and RFC 2307 server. * ldap.h: New header, declaring cyg_ldap class. * passwd.cc (passwd_buf): Drop. (pr): Drop. (pwdgrp::parse_passwd): Fill pg_pwd. (pwdgrp::read_passwd): Remove. (pwdgrp::init_pwd): New method. (pwdgrp::prep_tls_pwbuf): New method. (find_user): New methods. (internal_getpwsid): Convert to call new pwdgrp methods. (internal_getpwnam): Ditto. (internal_getpwuid): Ditto. (getpwuid32): Drop 2nd parameter from internal_getpwuid call. (getpwuid_r): Ditto. (getpwnam): Ditto for internal_getpwnam. (getpwnam_r): Ditto. (getpwent): Convert to call new pwdgrp methods. * path.cc (class etc): Remove all methods. * path.h (class etc): Drop. * pinfo.cc (pinfo_basic::pinfo_basic): Set gid to ILLEGAL_GID rather than UNKNOWN_GID. (pinfo_init): Ditto. * pwdgrp.h (internal_getpwnam): Drop 2nd parameter from declaration. (internal_getpwuid): Ditto. (internal_getgrgid): Ditto. (internal_getgrnam): Ditto. (internal_getgrent): Drop declaration. (enum fetch_user_arg_type_t): New type. (struct fetch_user_arg_t): New type. (struct pg_pwd): New type. (struct pg_grp): New type. (class pwdgrp): Rework to provide functions for file and db requests and caching. (class ugid_cache_t): New class to provide RFC 2307 uid map caching. (ugid_cache): Declare. * sec_acl.cc: Drop including pwdgrp.h. * sec_auth.cc: Drop including dsgetdc.h and pwdgrp.h. (get_logon_server): Convert third parameter to ULONG flags argument to allow arbitrary flags values in DsGetDcNameW call and change calls to this function throughout. Use cached account domain name rather than calling GetComputerNameW. (get_unix_group_sidlist): Remove. (get_server_groups): Drop call to get_unix_group_sidlist. (verify_token): Rework token group check without calling internal_getgrent. * sec_helper.cc (cygpsid::pstring): New methods, like string() but return pointer to end of string. (cygsid::getfromstr): Add wide character implementation. (get_sids_info): Add RFC 2307 uid/gid mapping for Samba shares. * security.cc: Drop including pwdgrp.h. * security.h (DEFAULT_UID): Remove. (UNKNOWN_UID): Remove. (UNKNOWN_GID): Remove. (uinfo_init): Move here from winsup.h. (ILLEGAL_UID): Ditto. (ILLEGAL_GID): Ditto. (UNIX_POSIX_OFFSET): Define. Add lengthy comment. (UNIX_POSIX_MASK): Ditto. (MAP_UNIX_TO_CYGWIN_ID): Ditto. (ILLEGAL_UID16): Move here from winsup.h. (ILLEGAL_GID16): Ditto. (uid16touid32): Ditto. (gid16togid32): Ditto. (sid_id_auth): New convenience macro for SID component access. (sid_sub_auth_count): Ditto. (sid_sub_auth): Ditto. (sid_sub_auth_rid): Ditto. (cygpsid::pstring): Declare. (cygsid::getfromstr): Declare wide character variant. (cygsid::operator=): Ditto. (cygsid::operator*=): Ditto. (get_logon_server): Change declaration according to source code. * setlsapwd.cc (setlsapwd): Drop 2nd parameter from internal_getpwnam call. * shared.cc (memory_init): Call cygheap->pg.init in first process. * syscalls.cc: Drop including pwdgrp.h. * tlsoffsets.h: Regenerate. * tlsoffsets64.h: Ditto. * uinfo.cc (internal_getlogin): Drop gratuitious internal_getpwuid call. Fix debug output. Overwrite user gid in border case of a missing passwd file while a group file exists. (pwdgrp::add_line): Allocate memory on cygheap. (pwdgrp::load): Remove. (ugid_cache): Define. (cygheap_pwdgrp::init): New method. (cygheap_pwdgrp::nss_init_line): New method. (cygheap_pwdgrp::_nss_init): New method. (cygheap_domain_info::init): New method. (logon_sid): Define. (get_logon_sid): New function. (pwdgrp::add_account_post_fetch): New method. (pwdgrp::add_account_from_file): New methods. (pwdgrp::add_account_from_windows): New methods. (pwdgrp::check_file): New method. (pwdgrp::fetch_account_from_line): New method. (pwdgrp::fetch_account_from_file): New method. (pwdgrp::fetch_account_from_windows): New method. * winsup.h: Move aforementioned macros and declarations to security.h.
This commit is contained in:
Corinna Vinschen
@ -14,7 +14,6 @@ details. */
|
||||
#include <wchar.h>
|
||||
#include <wininet.h>
|
||||
#include <ntsecapi.h>
|
||||
#include <dsgetdc.h>
|
||||
#include "cygerrno.h"
|
||||
#include "security.h"
|
||||
#include "path.h"
|
||||
@ -25,7 +24,6 @@ details. */
|
||||
#include "tls_pbuf.h"
|
||||
#include <lm.h>
|
||||
#include <iptypes.h>
|
||||
#include "pwdgrp.h"
|
||||
#include "cyglsa.h"
|
||||
#include "cygserver_setpwd.h"
|
||||
#include <cygwin/version.h>
|
||||
@ -220,28 +218,25 @@ lsa_close_policy (HANDLE lsa)
|
||||
}
|
||||
|
||||
bool
|
||||
get_logon_server (PWCHAR domain, WCHAR *server, bool rediscovery)
|
||||
get_logon_server (PWCHAR domain, WCHAR *server, ULONG flags)
|
||||
{
|
||||
DWORD ret;
|
||||
PDOMAIN_CONTROLLER_INFOW pci;
|
||||
DWORD size = MAX_COMPUTERNAME_LENGTH + 1;
|
||||
|
||||
/* Empty domain is interpreted as local system */
|
||||
if ((GetComputerNameW (server + 2, &size)) &&
|
||||
(!wcscasecmp (domain, server + 2) || !domain[0]))
|
||||
if (!domain[0] || !wcscasecmp (domain, cygheap->dom.account_flat_name ()))
|
||||
{
|
||||
server[0] = server[1] = L'\\';
|
||||
wcpcpy (wcpcpy (server, L"\\\\"), cygheap->dom.account_flat_name ());
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Try to get any available domain controller for this domain */
|
||||
ret = DsGetDcNameW (NULL, domain, NULL, NULL,
|
||||
rediscovery ? DS_FORCE_REDISCOVERY : 0, &pci);
|
||||
ret = DsGetDcNameW (NULL, domain, NULL, NULL, flags, &pci);
|
||||
if (ret == ERROR_SUCCESS)
|
||||
{
|
||||
wcscpy (server, pci->DomainControllerName);
|
||||
NetApiBufferFree (pci);
|
||||
debug_printf ("DC: rediscovery: %d, server: %W", rediscovery, server);
|
||||
debug_printf ("DC: server: %W", server);
|
||||
return true;
|
||||
}
|
||||
__seterrno_from_win_error (ret);
|
||||
@ -396,28 +391,6 @@ sid_in_token_groups (PTOKEN_GROUPS grps, cygpsid sid)
|
||||
return false;
|
||||
}
|
||||
|
||||
static void
|
||||
get_unix_group_sidlist (struct passwd *pw, cygsidlist &grp_list)
|
||||
{
|
||||
struct group *gr;
|
||||
cygsid gsid;
|
||||
|
||||
for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
|
||||
{
|
||||
if (gr->gr_gid == pw->pw_gid)
|
||||
goto found;
|
||||
else if (gr->gr_mem)
|
||||
for (int gi = 0; gr->gr_mem[gi]; ++gi)
|
||||
if (strcasematch (pw->pw_name, gr->gr_mem[gi]))
|
||||
goto found;
|
||||
continue;
|
||||
found:
|
||||
if (gsid.getfromgr (gr))
|
||||
grp_list += gsid;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
get_token_group_sidlist (cygsidlist &grp_list, PTOKEN_GROUPS my_grps,
|
||||
LUID auth_luid, int &auth_pos)
|
||||
@ -479,7 +452,6 @@ get_server_groups (cygsidlist &grp_list, PSID usersid, struct passwd *pw)
|
||||
if (well_known_system_sid == usersid)
|
||||
{
|
||||
grp_list *= well_known_admins_sid;
|
||||
get_unix_group_sidlist (pw, grp_list);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -491,12 +463,9 @@ get_server_groups (cygsidlist &grp_list, PSID usersid, struct passwd *pw)
|
||||
__seterrno ();
|
||||
return false;
|
||||
}
|
||||
if (get_logon_server (domain, server, false)
|
||||
&& !get_user_groups (server, grp_list, user, domain)
|
||||
&& get_logon_server (domain, server, true))
|
||||
if (get_logon_server (domain, server, DS_IS_FLAT_NAME))
|
||||
get_user_groups (server, grp_list, user, domain);
|
||||
get_user_local_groups (server, domain, grp_list, user);
|
||||
get_unix_group_sidlist (pw, grp_list);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -757,35 +726,26 @@ verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
|
||||
|
||||
if (groups.issetgroups ()) /* setgroups was called */
|
||||
{
|
||||
cygsid gsid;
|
||||
struct group *gr;
|
||||
cygpsid gsid;
|
||||
bool saw[groups.sgsids.count ()];
|
||||
memset (saw, 0, sizeof(saw));
|
||||
|
||||
/* token groups found in /etc/group match the user.gsids ? */
|
||||
for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
|
||||
if (gsid.getfromgr (gr) && sid_in_token_groups (my_grps, gsid))
|
||||
{
|
||||
int pos = groups.sgsids.position (gsid);
|
||||
if (pos >= 0)
|
||||
saw[pos] = true;
|
||||
else if (groups.pgsid == gsid)
|
||||
sawpg = true;
|
||||
#if 0
|
||||
/* With this `else', verify_token returns false if we find
|
||||
groups in the token, which are not in the group list set
|
||||
with setgroups(). That's rather dangerous. What we're
|
||||
really interested in is that all groups in the setgroups()
|
||||
list are in the token. A token created through ADVAPI
|
||||
should be allowed to contain more groups than requested
|
||||
through setgroups(), esecially since Vista and the
|
||||
addition of integrity groups. So we disable this statement
|
||||
for now. */
|
||||
else if (gsid != well_known_world_sid
|
||||
&& gsid != usersid)
|
||||
goto done;
|
||||
#endif
|
||||
}
|
||||
/* Check that all groups in the setgroups () list are in the token.
|
||||
A token created through ADVAPI should be allowed to contain more
|
||||
groups than requested through setgroups(), especially since Vista
|
||||
and the addition of integrity groups. */
|
||||
memset (saw, 0, sizeof(saw));
|
||||
for (int gidx = 0; gidx < groups.sgsids.count (); gidx++)
|
||||
{
|
||||
gsid = groups.sgsids.sids[gidx];
|
||||
if (sid_in_token_groups (my_grps, gsid))
|
||||
{
|
||||
int pos = groups.sgsids.position (gsid);
|
||||
if (pos >= 0)
|
||||
saw[pos] = true;
|
||||
else if (groups.pgsid == gsid)
|
||||
sawpg = true;
|
||||
}
|
||||
}
|
||||
/* user.sgsids groups must be in the token, except for builtin groups.
|
||||
These can be different on domain member machines compared to
|
||||
domain controllers, so these builtin groups may be validly missing
|
||||
|
||||
Reference in New Issue
Block a user