s3-ntlmssp: Remove ntlmssp_end and let the talloc hierarchy handle it.
[nivanova/samba-autobuild/.git] / source3 / auth / auth_ntlmssp.c
index 034d354a33712e3a9c665247ae7b5e823580776f..d343eef5ff909444571aebbad556a3ecca1a532b 100644 (file)
 */
 
 #include "includes.h"
+#include "../libcli/auth/ntlmssp.h"
+
+struct auth_ntlmssp_state {
+       TALLOC_CTX *mem_ctx;
+       struct auth_context *auth_context;
+       struct auth_serversupplied_info *server_info;
+       struct ntlmssp_state *ntlmssp_state;
+};
+
+NTSTATUS auth_ntlmssp_sign_packet(struct auth_ntlmssp_state *auth_ntlmssp_state,
+                                 TALLOC_CTX *sig_mem_ctx,
+                                 const uint8_t *data, size_t length,
+                                 const uint8_t *whole_pdu, size_t pdu_length,
+                                 DATA_BLOB *sig)
+{
+       return ntlmssp_sign_packet(auth_ntlmssp_state->ntlmssp_state, sig_mem_ctx, data, length, whole_pdu, pdu_length, sig);
+}
+
+NTSTATUS auth_ntlmssp_check_packet(struct auth_ntlmssp_state *auth_ntlmssp_state,
+                                  const uint8_t *data, size_t length,
+                                  const uint8_t *whole_pdu, size_t pdu_length,
+                                  const DATA_BLOB *sig)
+{
+       return ntlmssp_check_packet(auth_ntlmssp_state->ntlmssp_state, data, length, whole_pdu, pdu_length, sig);
+}
+
+NTSTATUS auth_ntlmssp_seal_packet(struct auth_ntlmssp_state *auth_ntlmssp_state,
+                                 TALLOC_CTX *sig_mem_ctx,
+                                 uint8_t *data, size_t length,
+                                 const uint8_t *whole_pdu, size_t pdu_length,
+                                 DATA_BLOB *sig)
+{
+       return ntlmssp_seal_packet(auth_ntlmssp_state->ntlmssp_state, sig_mem_ctx, data, length, whole_pdu, pdu_length, sig);
+}
+
+NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *auth_ntlmssp_state,
+                                   uint8_t *data, size_t length,
+                                   const uint8_t *whole_pdu, size_t pdu_length,
+                                   const DATA_BLOB *sig)
+{
+       return ntlmssp_unseal_packet(auth_ntlmssp_state->ntlmssp_state, data, length, whole_pdu, pdu_length, sig);
+}
+
+bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+       return auth_ntlmssp_state->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN;
+}
+
+bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+       return auth_ntlmssp_state->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL;
+}
+
+void auth_ntlmssp_want_sign(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+
+}
+
+void auth_ntlmssp_want_seal(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+
+}
+
+NTSTATUS auth_ntlmssp_server_info(TALLOC_CTX *mem_ctx,
+                                 struct auth_ntlmssp_state *auth_ntlmssp_state,
+                                 struct auth_serversupplied_info **_server_info)
+{
+       struct auth_serversupplied_info *server_info = auth_ntlmssp_state->server_info;
+       data_blob_free(&server_info->user_session_key);
+       server_info->user_session_key =
+               data_blob_talloc(
+                       server_info,
+                       auth_ntlmssp_state->ntlmssp_state->session_key.data,
+                       auth_ntlmssp_state->ntlmssp_state->session_key.length);
+       if (auth_ntlmssp_state->ntlmssp_state->session_key.length && !server_info->user_session_key.data) {
+               *_server_info = NULL;
+               return NT_STATUS_NO_MEMORY;
+       }
+       auth_ntlmssp_state->server_info = NULL;
+       *_server_info = talloc_steal(mem_ctx, server_info);
+       return NT_STATUS_OK;
+}
+
+struct ntlmssp_state *auth_ntlmssp_get_ntlmssp_state(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+       return auth_ntlmssp_state->ntlmssp_state;
+}
+
+/* Needed for 'map to guest' and 'smb username' processing */
+const char *auth_ntlmssp_get_username(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+       return auth_ntlmssp_state->ntlmssp_state->user;
+}
+
+const char *auth_ntlmssp_get_domain(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+       return auth_ntlmssp_state->ntlmssp_state->domain;
+}
+
+const char *auth_ntlmssp_get_client(struct auth_ntlmssp_state *auth_ntlmssp_state)
+{
+       return auth_ntlmssp_state->ntlmssp_state->client.netbios_name;
+}
 
 /**
  * Return the challenge as determined by the authentication subsystem 
  * @return an 8 byte random challenge
  */
 
-static void auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state,
-                                      uint8_t chal[8])
+static NTSTATUS auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state,
+                                          uint8_t chal[8])
 {
-       AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
-               (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
+       struct auth_ntlmssp_state *auth_ntlmssp_state =
+               (struct auth_ntlmssp_state *)ntlmssp_state->callback_private;
        auth_ntlmssp_state->auth_context->get_ntlm_challenge(
                auth_ntlmssp_state->auth_context, chal);
+       return NT_STATUS_OK;
 }
 
 /**
@@ -43,8 +147,8 @@ static void auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state
  */
 static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
 {
-       AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
-               (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
+       struct auth_ntlmssp_state *auth_ntlmssp_state =
+               (struct auth_ntlmssp_state *)ntlmssp_state->callback_private;
        struct auth_context *auth_context = auth_ntlmssp_state->auth_context;
 
        return auth_context->challenge_may_be_modified;
@@ -56,13 +160,13 @@ static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_s
  */
 static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
 {
-       AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
-               (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
+       struct auth_ntlmssp_state *auth_ntlmssp_state =
+               (struct auth_ntlmssp_state *)ntlmssp_state->callback_private;
        struct auth_context *auth_context = auth_ntlmssp_state->auth_context;
 
        SMB_ASSERT(challenge->length == 8);
 
-       auth_context->challenge = data_blob_talloc(auth_context->mem_ctx, 
+       auth_context->challenge = data_blob_talloc(auth_context,
                                                   challenge->data, challenge->length);
 
        auth_context->challenge_set_by = "NTLMSSP callback (NTLM2)";
@@ -81,16 +185,16 @@ static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state,
 
 static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key) 
 {
-       AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
-               (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
-       auth_usersupplied_info *user_info = NULL;
+       struct auth_ntlmssp_state *auth_ntlmssp_state =
+               (struct auth_ntlmssp_state *)ntlmssp_state->callback_private;
+       struct auth_usersupplied_info *user_info = NULL;
        NTSTATUS nt_status;
        bool username_was_mapped;
 
        /* the client has given us its machine name (which we otherwise would not get on port 445).
           we need to possibly reload smb.conf if smb.conf includes depend on the machine name */
 
-       set_remote_machine_name(auth_ntlmssp_state->ntlmssp_state->workstation, True);
+       set_remote_machine_name(auth_ntlmssp_state->ntlmssp_state->client.netbios_name, True);
 
        /* setup the string used by %U */
        /* sub_set_smb_name checks for weird internally */
@@ -101,7 +205,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
        nt_status = make_user_info_map(&user_info, 
                                       auth_ntlmssp_state->ntlmssp_state->user, 
                                       auth_ntlmssp_state->ntlmssp_state->domain, 
-                                      auth_ntlmssp_state->ntlmssp_state->workstation, 
+                                      auth_ntlmssp_state->ntlmssp_state->client.netbios_name,
                                       auth_ntlmssp_state->ntlmssp_state->lm_resp.data ? &auth_ntlmssp_state->ntlmssp_state->lm_resp : NULL, 
                                       auth_ntlmssp_state->ntlmssp_state->nt_resp.data ? &auth_ntlmssp_state->ntlmssp_state->nt_resp : NULL, 
                                       NULL, NULL, NULL,
@@ -151,14 +255,34 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
        return nt_status;
 }
 
-NTSTATUS auth_ntlmssp_start(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
+NTSTATUS auth_ntlmssp_start(struct auth_ntlmssp_state **auth_ntlmssp_state)
 {
        NTSTATUS nt_status;
        TALLOC_CTX *mem_ctx;
+       bool is_standalone;
+       const char *netbios_name;
+       const char *netbios_domain;
+       const char *dns_name;
+       char *dns_domain;
+
+       if ((enum server_types)lp_server_role() == ROLE_STANDALONE) {
+               is_standalone = true;
+       } else {
+               is_standalone = false;
+       }
+
+       netbios_name = global_myname();
+       netbios_domain = lp_workgroup();
+       /* This should be a 'netbios domain -> DNS domain' mapping */
+       dns_domain = get_mydnsdomname(talloc_tos());
+       if (dns_domain) {
+               strlower_m(dns_domain);
+       }
+       dns_name = get_mydnsfullname();
 
        mem_ctx = talloc_init("AUTH NTLMSSP context");
        
-       *auth_ntlmssp_state = TALLOC_ZERO_P(mem_ctx, AUTH_NTLMSSP_STATE);
+       *auth_ntlmssp_state = TALLOC_ZERO_P(mem_ctx, struct auth_ntlmssp_state);
        if (!*auth_ntlmssp_state) {
                DEBUG(0,("auth_ntlmssp_start: talloc failed!\n"));
                talloc_destroy(mem_ctx);
@@ -169,7 +293,14 @@ NTSTATUS auth_ntlmssp_start(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
 
        (*auth_ntlmssp_state)->mem_ctx = mem_ctx;
 
-       if (!NT_STATUS_IS_OK(nt_status = ntlmssp_server_start(&(*auth_ntlmssp_state)->ntlmssp_state))) {
+       nt_status = ntlmssp_server_start(NULL,
+                                        is_standalone,
+                                        netbios_name,
+                                        netbios_domain,
+                                        dns_name,
+                                        dns_domain,
+                                        &(*auth_ntlmssp_state)->ntlmssp_state);
+       if (!NT_STATUS_IS_OK(nt_status)) {
                return nt_status;
        }
 
@@ -177,17 +308,16 @@ NTSTATUS auth_ntlmssp_start(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
                return nt_status;
        }
 
-       (*auth_ntlmssp_state)->ntlmssp_state->auth_context = (*auth_ntlmssp_state);
+       (*auth_ntlmssp_state)->ntlmssp_state->callback_private = (*auth_ntlmssp_state);
        (*auth_ntlmssp_state)->ntlmssp_state->get_challenge = auth_ntlmssp_get_challenge;
        (*auth_ntlmssp_state)->ntlmssp_state->may_set_challenge = auth_ntlmssp_may_set_challenge;
        (*auth_ntlmssp_state)->ntlmssp_state->set_challenge = auth_ntlmssp_set_challenge;
        (*auth_ntlmssp_state)->ntlmssp_state->check_password = auth_ntlmssp_check_password;
-       (*auth_ntlmssp_state)->ntlmssp_state->server_role = (enum server_types)lp_server_role();
 
        return NT_STATUS_OK;
 }
 
-void auth_ntlmssp_end(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
+void auth_ntlmssp_end(struct auth_ntlmssp_state **auth_ntlmssp_state)
 {
        TALLOC_CTX *mem_ctx;
 
@@ -197,7 +327,7 @@ void auth_ntlmssp_end(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
 
        mem_ctx = (*auth_ntlmssp_state)->mem_ctx;
        if ((*auth_ntlmssp_state)->ntlmssp_state) {
-               ntlmssp_end(&(*auth_ntlmssp_state)->ntlmssp_state);
+               TALLOC_FREE((*auth_ntlmssp_state)->ntlmssp_state);
        }
        if ((*auth_ntlmssp_state)->auth_context) {
                ((*auth_ntlmssp_state)->auth_context->free)(&(*auth_ntlmssp_state)->auth_context);
@@ -209,7 +339,7 @@ void auth_ntlmssp_end(AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
        *auth_ntlmssp_state = NULL;
 }
 
-NTSTATUS auth_ntlmssp_update(AUTH_NTLMSSP_STATE *auth_ntlmssp_state, 
+NTSTATUS auth_ntlmssp_update(struct auth_ntlmssp_state *auth_ntlmssp_state,
                             const DATA_BLOB request, DATA_BLOB *reply) 
 {
        return ntlmssp_update(auth_ntlmssp_state->ntlmssp_state, request, reply);