s3:cli_netlogon: add rpccli_{create,setup}_netlogon_creds_with_creds() helper functions
[obnox/samba/samba-obnox.git] / source3 / rpc_client / cli_netlogon.c
index 253d0608517ee4918940db70d4eb7561ccfb0b79..b08c10fb7830d7003f3c6bb13ec97f5155fcb1ec 100644 (file)
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libsmb/libsmb.h"
 #include "rpc_client/rpc_client.h"
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/security/security.h"
 #include "lib/param/param.h"
 #include "libcli/smb/smbXcli_base.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "util_tdb.h"
 
-/****************************************************************************
- Wrapper function that uses the auth and auth2 calls to set up a NETLOGON
- credentials chain. Stores the credentials in the struct dcinfo in the
- netlogon pipe struct.
-****************************************************************************/
-
-NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
-                                    const char *server_name,
-                                    const char *domain,
-                                    const char *clnt_name,
-                                    const char *machine_account,
-                                    const unsigned char machine_pwd[16],
-                                    enum netr_SchannelType sec_chan_type,
-                                    uint32_t *neg_flags_inout)
+
+NTSTATUS rpccli_pre_open_netlogon_creds(void)
 {
-       TALLOC_CTX *frame = talloc_stackframe();
+       static bool already_open = false;
+       TALLOC_CTX *frame;
        struct loadparm_context *lp_ctx;
+       char *fname;
+       struct db_context *global_db;
        NTSTATUS status;
-       struct samr_Password password;
-       fstring mach_acct;
-       struct dcerpc_binding_handle *b = cli->binding_handle;
-       struct netlogon_creds_CredentialState *creds = NULL;
 
-       if (!ndr_syntax_id_equal(&cli->abstract_syntax,
-                                &ndr_table_netlogon.syntax_id)) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (!strequal(lp_netbios_name(), clnt_name)) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INVALID_PARAMETER;
+       if (already_open) {
+               return NT_STATUS_OK;
        }
 
-       TALLOC_FREE(cli->netlogon_creds);
-
-       fstr_sprintf( mach_acct, "%s$", machine_account);
+       frame = talloc_stackframe();
 
        lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
        if (lp_ctx == NULL) {
                TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
-       status = netlogon_creds_cli_context_global(lp_ctx,
-                                                  NULL, /* msg_ctx */
-                                                  mach_acct,
-                                                  sec_chan_type,
-                                                  server_name,
-                                                  domain,
-                                                  cli, &cli->netlogon_creds);
-       talloc_unlink(frame, lp_ctx);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
-               return status;
-       }
 
-       status = netlogon_creds_cli_get(cli->netlogon_creds,
-                                       frame, &creds);
-       if (NT_STATUS_IS_OK(status)) {
-               DEBUG(5,("rpccli_netlogon_setup_creds: server %s using "
-                        "cached credential\n",
-                        cli->desthost));
-               *neg_flags_inout = creds->negotiate_flags;
+       fname = lpcfg_private_db_path(frame, lp_ctx, "netlogon_creds_cli");
+       if (fname == NULL) {
                TALLOC_FREE(frame);
-               return NT_STATUS_OK;
-       }
-
-       /* Store the machine account password we're going to use. */
-       memcpy(password.hash, machine_pwd, 16);
-
-       DEBUG(5,("rpccli_netlogon_setup_creds: server %s credential "
-               "chain established.\n",
-               cli->desthost ));
-
-       status = netlogon_creds_cli_auth(cli->netlogon_creds, b,
-                                        password, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
-               return status;
+               return NT_STATUS_NO_MEMORY;
        }
 
-       status = netlogon_creds_cli_get(cli->netlogon_creds,
-                                       frame, &creds);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       *neg_flags_inout = creds->negotiate_flags;
-       TALLOC_FREE(frame);
-       return NT_STATUS_OK;
-}
-
-NTSTATUS rpccli_pre_open_netlogon_creds(void)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct loadparm_context *lp_ctx;
-       NTSTATUS status;
-
-       lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
-       if (lp_ctx == NULL) {
+       global_db = db_open(talloc_autofree_context(), fname,
+                           0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+                           O_RDWR|O_CREAT, 0600, DBWRAP_LOCK_ORDER_2,
+                           DBWRAP_FLAG_OPTIMIZE_READONLY_ACCESS);
+       if (global_db == NULL) {
                TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = netlogon_creds_cli_open_global_db(lp_ctx);
+       status = netlogon_creds_cli_set_global_db(&global_db);
        TALLOC_FREE(frame);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
+       already_open = true;
        return NT_STATUS_OK;
 }
 
@@ -161,6 +98,12 @@ NTSTATUS rpccli_create_netlogon_creds(const char *server_computer,
        struct loadparm_context *lp_ctx;
        NTSTATUS status;
 
+       status = rpccli_pre_open_netlogon_creds();
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return status;
+       }
+
        lp_ctx = loadparm_init_s3(frame, loadparm_s3_helpers());
        if (lp_ctx == NULL) {
                TALLOC_FREE(frame);
@@ -181,7 +124,34 @@ NTSTATUS rpccli_create_netlogon_creds(const char *server_computer,
        return NT_STATUS_OK;
 }
 
+NTSTATUS rpccli_create_netlogon_creds_with_creds(struct cli_credentials *creds,
+                                                const char *server_computer,
+                                                struct messaging_context *msg_ctx,
+                                                TALLOC_CTX *mem_ctx,
+                                                struct netlogon_creds_cli_context **netlogon_creds)
+{
+       enum netr_SchannelType sec_chan_type;
+       const char *server_netbios_domain;
+       const char *client_account;
+
+       sec_chan_type = cli_credentials_get_secure_channel_type(creds);
+       if (sec_chan_type == SEC_CHAN_NULL) {
+               return NT_STATUS_INVALID_PARAMETER_MIX;
+       }
+
+       client_account = cli_credentials_get_username(creds);
+       server_netbios_domain = cli_credentials_get_domain(creds);
+
+       return rpccli_create_netlogon_creds(server_computer,
+                                           server_netbios_domain,
+                                           client_account,
+                                           sec_chan_type,
+                                           msg_ctx, mem_ctx,
+                                           netlogon_creds);
+}
+
 NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
+                                    enum dcerpc_transport_t transport,
                                     struct netlogon_creds_cli_context *netlogon_creds,
                                     bool force_reauth,
                                     struct samr_Password current_nt_hash,
@@ -212,9 +182,10 @@ NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
                TALLOC_FREE(creds);
        }
 
-       status = cli_rpc_pipe_open_noauth(cli,
-                                         &ndr_table_netlogon,
-                                         &netlogon_pipe);
+       status = cli_rpc_pipe_open_noauth_transport(cli,
+                                                   transport,
+                                                   &ndr_table_netlogon,
+                                                   &netlogon_pipe);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(5,("%s: failed to open noauth netlogon connection to %s - %s\n",
                         __FUNCTION__,
@@ -250,35 +221,117 @@ NTSTATUS rpccli_setup_netlogon_creds(struct cli_state *cli,
        return NT_STATUS_OK;
 }
 
+NTSTATUS rpccli_setup_netlogon_creds_with_creds(struct cli_state *cli,
+                                               enum dcerpc_transport_t transport,
+                                               struct netlogon_creds_cli_context *netlogon_creds,
+                                               bool force_reauth,
+                                               struct cli_credentials *creds)
+{
+       struct samr_Password *current_nt_hash = NULL;
+       struct samr_Password *previous_nt_hash = NULL;
+       NTSTATUS status;
+
+       current_nt_hash = cli_credentials_get_nt_hash(creds, talloc_tos());
+       if (current_nt_hash == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = rpccli_setup_netlogon_creds(cli, transport,
+                                            netlogon_creds,
+                                            force_reauth,
+                                            *current_nt_hash,
+                                            previous_nt_hash);
+       TALLOC_FREE(current_nt_hash);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
+                                       uint16_t validation_level,
+                                       union netr_Validation *validation,
+                                       struct netr_SamInfo3 **info3_p)
+{
+       struct netr_SamInfo3 *info3;
+       NTSTATUS status;
+
+       if (validation == NULL) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       switch (validation_level) {
+       case 3:
+               if (validation->sam3 == NULL) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+
+               info3 = talloc_move(mem_ctx, &validation->sam3);
+               break;
+       case 6:
+               if (validation->sam6 == NULL) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+
+               info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
+               if (info3 == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               status = copy_netr_SamBaseInfo(info3, &validation->sam6->base, &info3->base);
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(info3);
+                       return status;
+               }
+
+               info3->sidcount = validation->sam6->sidcount;
+               info3->sids = talloc_move(info3, &validation->sam6->sids);
+               break;
+       default:
+               return NT_STATUS_BAD_VALIDATION_CLASS;
+       }
+
+       *info3_p = info3;
+
+       return NT_STATUS_OK;
+}
+
 /* Logon domain user */
 
-NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
-                                  TALLOC_CTX *mem_ctx,
-                                  uint32 logon_parameters,
-                                  const char *domain,
-                                  const char *username,
-                                  const char *password,
-                                  const char *workstation,
-                                  uint16_t _ignored_validation_level,
-                                  int logon_type)
+NTSTATUS rpccli_netlogon_password_logon(struct netlogon_creds_cli_context *creds,
+                                       struct dcerpc_binding_handle *binding_handle,
+                                       TALLOC_CTX *mem_ctx,
+                                       uint32_t logon_parameters,
+                                       const char *domain,
+                                       const char *username,
+                                       const char *password,
+                                       const char *workstation,
+                                       enum netr_LogonInfoClass logon_type,
+                                       struct netr_SamInfo3 **info3)
 {
+       TALLOC_CTX *frame = talloc_stackframe();
        NTSTATUS status;
        union netr_LogonLevel *logon;
        uint16_t validation_level = 0;
        union netr_Validation *validation = NULL;
        uint8_t authoritative = 0;
        uint32_t flags = 0;
-       fstring clnt_name_slash;
+       char *workstation_slash = NULL;
 
-       logon = talloc_zero(mem_ctx, union netr_LogonLevel);
-       if (!logon) {
+       logon = talloc_zero(frame, union netr_LogonLevel);
+       if (logon == NULL) {
+               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (workstation) {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", workstation );
-       } else {
-               fstr_sprintf( clnt_name_slash, "\\\\%s", lp_netbios_name() );
+       if (workstation == NULL) {
+               workstation = lp_netbios_name();
+       }
+
+       workstation_slash = talloc_asprintf(frame, "\\\\%s", workstation);
+       if (workstation_slash == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
        }
 
        /* Initialise input parameters */
@@ -291,8 +344,9 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                struct samr_Password lmpassword;
                struct samr_Password ntpassword;
 
-               password_info = talloc_zero(mem_ctx, struct netr_PasswordInfo);
-               if (!password_info) {
+               password_info = talloc_zero(frame, struct netr_PasswordInfo);
+               if (password_info == NULL) {
+                       TALLOC_FREE(frame);
                        return NT_STATUS_NO_MEMORY;
                }
 
@@ -303,7 +357,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                password_info->identity_info.logon_id_low               = 0xdead;
                password_info->identity_info.logon_id_high              = 0xbeef;
                password_info->identity_info.account_name.string        = username;
-               password_info->identity_info.workstation.string         = clnt_name_slash;
+               password_info->identity_info.workstation.string         = workstation_slash;
 
                password_info->lmpassword = lmpassword;
                password_info->ntpassword = ntpassword;
@@ -323,8 +377,9 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                ZERO_STRUCT(lm);
                ZERO_STRUCT(nt);
 
-               network_info = talloc_zero(mem_ctx, struct netr_NetworkInfo);
-               if (!network_info) {
+               network_info = talloc_zero(frame, struct netr_NetworkInfo);
+               if (network_info == NULL) {
+                       TALLOC_FREE(frame);
                        return NT_STATUS_NO_MEMORY;
                }
 
@@ -344,7 +399,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
                network_info->identity_info.logon_id_low                = 0xdead;
                network_info->identity_info.logon_id_high               = 0xbeef;
                network_info->identity_info.account_name.string         = username;
-               network_info->identity_info.workstation.string          = clnt_name_slash;
+               network_info->identity_info.workstation.string          = workstation_slash;
 
                memcpy(network_info->challenge, chal, 8);
                network_info->nt = nt;
@@ -357,68 +412,32 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
        default:
                DEBUG(0, ("switch value %d not supported\n",
                        logon_type));
+               TALLOC_FREE(frame);
                return NT_STATUS_INVALID_INFO_CLASS;
        }
 
-       status = netlogon_creds_cli_LogonSamLogon(cli->netlogon_creds,
-                                                 cli->binding_handle,
+       status = netlogon_creds_cli_LogonSamLogon(creds,
+                                                 binding_handle,
                                                  logon_type,
                                                  logon,
-                                                 mem_ctx,
+                                                 frame,
                                                  &validation_level,
                                                  &validation,
                                                  &authoritative,
                                                  &flags);
        if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
                return status;
        }
 
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
-                                       uint16_t validation_level,
-                                       union netr_Validation *validation,
-                                       struct netr_SamInfo3 **info3_p)
-{
-       struct netr_SamInfo3 *info3;
-       NTSTATUS status;
-
-       if (validation == NULL) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       switch (validation_level) {
-       case 3:
-               if (validation->sam3 == NULL) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-
-               info3 = talloc_move(mem_ctx, &validation->sam3);
-               break;
-       case 6:
-               if (validation->sam6 == NULL) {
-                       return NT_STATUS_INVALID_PARAMETER;
-               }
-
-               info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
-               if (info3 == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-               status = copy_netr_SamBaseInfo(info3, &validation->sam6->base, &info3->base);
-               if (!NT_STATUS_IS_OK(status)) {
-                       TALLOC_FREE(info3);
-                       return status;
-               }
-
-               info3->sidcount = validation->sam6->sidcount;
-               info3->sids = talloc_move(info3, &validation->sam6->sids);
-               break;
-       default:
-               return NT_STATUS_BAD_VALIDATION_CLASS;
+       status = map_validation_to_info3(mem_ctx,
+                                        validation_level, validation,
+                                        info3);
+       TALLOC_FREE(frame);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       *info3_p = info3;
 
        return NT_STATUS_OK;
 }
@@ -429,18 +448,20 @@ static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
  * @param info3 Pointer to a NET_USER_INFO_3 already allocated by the caller.
  **/
 
-NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
-                                          TALLOC_CTX *mem_ctx,
-                                          uint32 logon_parameters,
-                                          const char *server,
-                                          const char *username,
-                                          const char *domain,
-                                          const char *workstation,
-                                          const uint8 chal[8],
-                                          uint16_t _ignored_validation_level,
-                                          DATA_BLOB lm_response,
-                                          DATA_BLOB nt_response,
-                                          struct netr_SamInfo3 **info3)
+
+NTSTATUS rpccli_netlogon_network_logon(struct netlogon_creds_cli_context *creds,
+                                      struct dcerpc_binding_handle *binding_handle,
+                                      TALLOC_CTX *mem_ctx,
+                                      uint32_t logon_parameters,
+                                      const char *username,
+                                      const char *domain,
+                                      const char *workstation,
+                                      const uint8 chal[8],
+                                      DATA_BLOB lm_response,
+                                      DATA_BLOB nt_response,
+                                      uint8_t *authoritative,
+                                      uint32_t *flags,
+                                      struct netr_SamInfo3 **info3)
 {
        NTSTATUS status;
        const char *workstation_name_slash;
@@ -448,13 +469,20 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
        struct netr_NetworkInfo *network_info;
        uint16_t validation_level = 0;
        union netr_Validation *validation = NULL;
-       uint8_t authoritative = 0;
-       uint32_t flags = 0;
+       uint8_t _authoritative = 0;
+       uint32_t _flags = 0;
        struct netr_ChallengeResponse lm;
        struct netr_ChallengeResponse nt;
 
        *info3 = NULL;
 
+       if (authoritative == NULL) {
+               authoritative = &_authoritative;
+       }
+       if (flags == NULL) {
+               flags = &_flags;
+       }
+
        ZERO_STRUCT(lm);
        ZERO_STRUCT(nt);
 
@@ -501,15 +529,15 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        /* Marshall data and send request */
 
-       status = netlogon_creds_cli_LogonSamLogon(cli->netlogon_creds,
-                                                 cli->binding_handle,
+       status = netlogon_creds_cli_LogonSamLogon(creds,
+                                                 binding_handle,
                                                  NetlogonNetworkInformation,
                                                  logon,
                                                  mem_ctx,
                                                  &validation_level,
                                                  &validation,
-                                                 &authoritative,
-                                                 &flags);
+                                                 authoritative,
+                                                 flags);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -523,54 +551,3 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 
        return NT_STATUS_OK;
 }
-
-/*********************************************************
- Change the domain password on the PDC.
-
- Just changes the password betwen the two values specified.
-
- Caller must have the cli connected to the netlogon pipe
- already.
-**********************************************************/
-
-NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
-                                           TALLOC_CTX *mem_ctx,
-                                           const char *account_name,
-                                           const unsigned char orig_trust_passwd_hash[16],
-                                           const char *new_trust_pwd_cleartext,
-                                           const unsigned char new_trust_passwd_hash[16],
-                                           enum netr_SchannelType sec_channel_type)
-{
-       NTSTATUS result;
-
-       if (cli->netlogon_creds == NULL) {
-               uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS |
-                                       NETLOGON_NEG_SUPPORTS_AES;
-               result = rpccli_netlogon_setup_creds(cli,
-                                                    cli->desthost, /* server name */
-                                                    lp_workgroup(), /* domain */
-                                                    lp_netbios_name(), /* client name */
-                                                    account_name, /* machine account name */
-                                                    orig_trust_passwd_hash,
-                                                    sec_channel_type,
-                                                    &neg_flags);
-               if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(3,("rpccli_netlogon_set_trust_password: unable to setup creds (%s)!\n",
-                                nt_errstr(result)));
-                       return result;
-               }
-       }
-
-       result = netlogon_creds_cli_ServerPasswordSet(cli->netlogon_creds,
-                                                     cli->binding_handle,
-                                                     new_trust_pwd_cleartext,
-                                                     NULL); /* new_version */
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0,("netlogon_creds_cli_ServerPasswordSet failed: %s\n",
-                       nt_errstr(result)));
-               return result;
-       }
-
-       return NT_STATUS_OK;
-}
-