auth: For NTLM and KDC authentication, log the authentication duration

[samba.git] / source3 / include / auth.h

diff --git a/source3/include/auth.h b/source3/include/auth.h
index dd700592900fd1d6dbd6fa9f5d60b6d4d3e9b35a..0facb8668cd37f5167689acd55230292985ac73d 100644 (file)
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -30,13 +30,18 @@ struct extra_auth_info {
 
 struct auth_serversupplied_info {
        bool guest;
-       bool system;
 
        struct security_unix_token utok;
 
-       /* NT group information taken from the info3 structure */
-
-       struct security_token *security_token;
+       /*
+        * A complete auth_session_info
+        *
+        * This is not normally filled in, during the typical
+        * authentication process.  If filled in, it has already been
+        * finalised by a nasty hack to support a cached guest/system
+        * session_info
+        */
+       const struct auth_session_info *cached_session_info;
 
        /* These are the intermediate session keys, as provided by a
         * NETLOGON server and used by NTLMSSP to negotiate key
@@ -66,29 +71,31 @@ struct auth_serversupplied_info {
        char *unix_name;
 };
 
-typedef NTSTATUS (*prepare_gensec_fn)(TALLOC_CTX *mem_ctx,
+struct auth_context;
+
+typedef NTSTATUS (*prepare_gensec_fn)(const struct auth_context *auth_context, 
+                                     TALLOC_CTX *mem_ctx,
                                      struct gensec_security **gensec_context);
 
+typedef NTSTATUS (*make_auth4_context_fn)(const struct auth_context *auth_context, 
+                                         TALLOC_CTX *mem_ctx,
+                                         struct auth4_context **auth4_context);
+
 struct auth_context {
        DATA_BLOB challenge; 
 
+       /* What time did this start */
+       struct timeval start_time;
+
        /* Who set this up in the first place? */ 
        const char *challenge_set_by; 
 
-       bool challenge_may_be_modified;
-
-       struct auth_methods *challenge_set_method; 
        /* What order are the various methods in?   Try to stop it changing under us */ 
        struct auth_methods *auth_method_list;  
 
-       NTSTATUS (*get_ntlm_challenge)(struct auth_context *auth_context,
-                                      uint8_t chal[8]);
-       NTSTATUS (*check_ntlm_password)(const struct auth_context *auth_context,
-                                       const struct auth_usersupplied_info *user_info, 
-                                       struct auth_serversupplied_info **server_info);
-       NTSTATUS (*nt_status_squash)(NTSTATUS nt_status);
-
        prepare_gensec_fn prepare_gensec;
+       make_auth4_context_fn make_auth4_context;
+       const char *forced_samba4_methods;
 };
 
 typedef struct auth_methods
@@ -102,19 +109,14 @@ typedef struct auth_methods
                         const struct auth_usersupplied_info *user_info, 
                         struct auth_serversupplied_info **server_info);
 
-       /* If you are using this interface, then you are probably
-        * getting something wrong.  This interface is only for
-        * security=server, and makes a number of compromises to allow
-        * that.  It is not compatible with being a PDC.  */
-       DATA_BLOB (*get_chal)(const struct auth_context *auth_context,
-                             void **my_private_data, 
-                             TALLOC_CTX *mem_ctx);
-
-       /* Optional methods allowing this module to provide a way to get a gensec context */
+       /* Optional methods allowing this module to provide a way to get a gensec context and an auth4_context */
        prepare_gensec_fn prepare_gensec;
+       make_auth4_context_fn make_auth4_context;
        /* Used to keep tabs on things like the cli for SMB server authentication */
        void *private_data;
 
+       uint32_t flags;
+
 } auth_methods;
 
 typedef NTSTATUS (*auth_init_function)(struct auth_context *, const char *, struct auth_methods **);
@@ -130,9 +132,17 @@ struct auth_init_function_entry {
 
 extern const struct gensec_security_ops gensec_ntlmssp3_server_ops;
 
+/* Intent of use for session key. LSA and SAMR pipes use 16 bytes of session key when doing create/modify calls */
+enum session_key_use_intent {
+       KEY_USE_FULL = 0,
+       KEY_USE_16BYTES
+};
+
 /* Changed from 1 -> 2 to add the logon_parameters field. */
 /* Changed from 2 -> 3 when we reworked many auth structures to use IDL or be in common with Samba4 */
-#define AUTH_INTERFACE_VERSION 3
+/* Changed from 3 -> 4 when we reworked added the flags */
+/* Changed from 4 -> 5 as module init functions now take a TALLOC_CTX * */
+#define AUTH_INTERFACE_VERSION 5
 
 #include "auth/proto.h"