Support the SMB_QUERY_POSIX_WHOAMI info level on QueryFsInfo.

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@21717 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/include/trans2.h b/source/include/trans2.h
index 89227c39d9b851495177f9861a116615a1310c9a..c6d98c7ed3d30e1040af2fda04f67ab42f93b56e 100644 (file)
--- a/source/include/trans2.h
+++ b/source/include/trans2.h
@@ -579,6 +579,37 @@ number of entries sent will be zero.
 
 */
 
+#define SMB_QUERY_POSIX_WHOAMI     0x202
+
+enum smb_whoami_flags {
+    SMB_WHOAMI_GUEST = 0x1 /* Logged in as (or squashed to) guest */
+};
+
+/* Mask of which WHOAMI bits are valid. This should make it easier for clients
+ * to cope with servers that have different sets of WHOAMI flags (as more get
+ * added).
+ */
+#define SMB_WHOAMI_MASK 0x00000001
+
+/*
+   SMBWhoami - Query the user mapping performed by the server for the
+   connected tree. This is a subcommand of the TRANS2_QFSINFO.
+
+   Returns:
+       4 bytes unsigned -      mapping flags (smb_whoami_flags)
+       4 bytes unsigned -      flags mask
+
+       8 bytes unsigned -      primary UID
+       8 bytes unsigned -      primary GID
+       4 bytes unsigned -      number of supplementary GIDs
+       4 bytes unsigned -      number of SIDs
+       4 bytes unsigned -      SID list byte count
+       4 bytes -               pad / reserved (must be zero)
+
+       8 bytes unsigned[] -    list of GIDs (may be empty)
+       DOM_SID[] -             list of SIDs (may be empty)
+*/
+
 /* The query/set info levels for POSIX ACLs. */
 #define SMB_QUERY_POSIX_ACL  0x204
 #define SMB_SET_POSIX_ACL  0x204

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 41fd2c5102e6a694db24e0cdaeb2bc92642b3632..0951160b3c7c49611c7b7da6ac99edf3317fc527 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -5,6 +5,7 @@
    Copyright (C) Stefan (metze) Metzmacher     2003
    Copyright (C) Volker Lendecke               2005
    Copyright (C) Steve French                  2005
+   Copyright (C) James Peach                   2007
 
    Extensively modified by Andrew Tridgell, 1995
 
@@ -2232,7 +2233,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
                                        char **pparams, int total_params, char **ppdata, int total_data,
                                        unsigned int max_data_bytes)
 {
-       char *pdata = *ppdata;
+       char *pdata;
        char *params = *pparams;
        uint16 info_level;
        int data_len, len;
@@ -2566,6 +2567,114 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                        break;
                }
 
+               case SMB_QUERY_POSIX_WHOAMI:
+               {
+                       uint32_t flags = 0;
+                       uint32_t sid_bytes;
+                       int i;
+
+                       if (!lp_unix_extensions()) {
+                               return ERROR_NT(NT_STATUS_INVALID_LEVEL);
+                       }
+
+                       if (max_data_bytes < 40) {
+                               return ERROR_NT(NT_STATUS_BUFFER_TOO_SMALL);
+                       }
+
+                       /* We ARE guest if global_sid_Builtin_Guests is
+                        * in our list of SIDs.
+                        */
+                       if (nt_token_check_sid(&global_sid_Builtin_Guests,
+                                   current_user.nt_user_token)) {
+                               flags |= SMB_WHOAMI_GUEST;
+                       }
+
+                       /* We are NOT guest if global_sid_Authenticated_Users
+                        * is in our list of SIDs.
+                        */
+                       if (nt_token_check_sid(&global_sid_Authenticated_Users,
+                                   current_user.nt_user_token)) {
+                               flags &= ~SMB_WHOAMI_GUEST;
+                       }
+
+                       /* NOTE: 8 bytes for UID/GID, irrespective of native
+                        * platform size. This matches
+                        * SMB_QUERY_FILE_UNIX_BASIC and friends.
+                        */
+                       data_len = 4 /* flags */
+                           + 4 /* flag mask */
+                           + 8 /* uid */
+                           + 8 /* gid */
+                           + 4 /* ngroups */
+                           + 4 /* num_sids */
+                           + 4 /* SID bytes */
+                           + 4 /* pad/reserved */
+                           + (current_user.ut.ngroups * 8)
+                               /* groups list */
+                           + (current_user.nt_user_token->num_sids *
+                                   SID_MAX_SIZE)
+                               /* SID list */;
+
+                       SIVAL(pdata, 0, flags);
+                       SIVAL(pdata, 4, SMB_WHOAMI_MASK);
+                       SBIG_UINT(pdata, 8, (SMB_BIG_UINT)current_user.ut.uid);
+                       SBIG_UINT(pdata, 16, (SMB_BIG_UINT)current_user.ut.gid);
+
+
+                       if (data_len >= max_data_bytes) {
+                               /* Potential overflow, skip the GIDs and SIDs. */
+
+                               SIVAL(pdata, 24, 0); /* num_groups */
+                               SIVAL(pdata, 28, 0); /* num_sids */
+                               SIVAL(pdata, 32, 0); /* num_sid_bytes */
+                               SIVAL(pdata, 36, 0); /* reserved */
+
+                               data_len = 40;
+                               break;
+                       }
+
+                       SIVAL(pdata, 24, current_user.ut.ngroups);
+                       SIVAL(pdata, 28,
+                               current_user.nt_user_token->num_sids);
+
+                       /* We walk the SID list twice, but this call is fairly
+                        * infrequent, and I don't expect that it's performance
+                        * sensitive -- jpeach
+                        */
+                       for (i = 0, sid_bytes = 0;
+                           i < current_user.nt_user_token->num_sids; ++i) {
+                               sid_bytes +=
+                                   sid_size(&current_user.nt_user_token->user_sids[i]);
+                       }
+
+                       /* SID list byte count */
+                       SIVAL(pdata, 32, sid_bytes);
+
+                       /* 4 bytes pad/reserved - must be zero */
+                       SIVAL(pdata, 36, 0);
+                       data_len = 40;
+
+                       /* GID list */
+                       for (i = 0; i < current_user.ut.ngroups; ++i) {
+                               SBIG_UINT(pdata, data_len,
+                                       (SMB_BIG_UINT)current_user.ut.groups[i]);
+                               data_len += 8;
+                       }
+
+                       /* SID list */
+                       for (i = 0;
+                           i < current_user.nt_user_token->num_sids; ++i) {
+                               int sid_len =
+                                   sid_size(&current_user.nt_user_token->user_sids[i]);
+
+                               sid_linearize(pdata + data_len, sid_len,
+                                   &current_user.nt_user_token->user_sids[i]);
+                               data_len += sid_len;
+                       }
+
+                       break;
+               }
+
                case SMB_MAC_QUERY_FS_INFO:
                        /*
                         * Thursby MAC extension... ONLY on NTFS filesystems