summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/librpc/rpc/dcerpc_auth.c105
-rw-r--r--source4/librpc/rpc/dcerpc_ntlm.c85
-rw-r--r--source4/librpc/rpc/dcerpc_spnego.c95
-rw-r--r--source4/librpc/rpc/dcerpc_util.c14
5 files changed, 101 insertions, 200 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 61eb0d5a00..3fbd5dadbc 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -23,8 +23,6 @@ ADD_OBJ_FILES = \
librpc/rpc/dcerpc_util.o \
librpc/rpc/dcerpc_error.o \
librpc/rpc/dcerpc_schannel.o \
- librpc/rpc/dcerpc_ntlm.o \
- librpc/rpc/dcerpc_spnego.o \
librpc/rpc/dcerpc_smb.o \
librpc/rpc/dcerpc_sock.o
REQUIRED_SUBSYSTEMS = SOCKET
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index 228a99d5c5..1c73bde6e4 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -5,7 +5,7 @@
Copyright (C) Andrew Tridgell 2003
Copyright (C) Andrew Bartlett <abartlet@samba.org> 2004
-
+ Copyright (C) Stefan Metzmacher 2004
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -86,27 +86,33 @@ NTSTATUS dcerpc_bind_auth(struct dcerpc_pipe *p, uint8_t auth_type, uint8_t auth
goto done;
}
- status = gensec_update(p->conn->security_state.generic_state, tmp_ctx,
- p->conn->security_state.auth_info->credentials,
- &credentials);
- if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
- goto done;
- }
+ while (1) {
+ status = gensec_update(p->conn->security_state.generic_state, tmp_ctx,
+ p->conn->security_state.auth_info->credentials,
+ &credentials);
+ if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+ break;
+ }
- do {
- p->conn->security_state.auth_info->credentials = credentials;
+ if (!credentials.length) {
+ break;
+ }
+ p->conn->security_state.auth_info->credentials = credentials;
+
if (auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
status = dcerpc_alter_context(p, tmp_ctx, &p->syntax, &p->transfer_syntax);
- if (NT_STATUS_IS_OK(status)) {
- status = gensec_update(p->conn->security_state.generic_state, tmp_ctx,
- p->conn->security_state.auth_info->credentials,
- &credentials);
+ if (!NT_STATUS_IS_OK(status)) {
+ break;
}
} else {
status = dcerpc_auth3(p->conn, tmp_ctx);
+ credentials = data_blob(NULL, 0);
+ if (!NT_STATUS_IS_OK(status)) {
+ break;
+ }
}
- } while (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED));
+ };
done:
talloc_free(tmp_ctx);
@@ -122,3 +128,74 @@ done:
return status;
}
+/*
+ setup GENSEC on a DCE-RPC pipe
+*/
+NTSTATUS dcerpc_bind_auth_password(struct dcerpc_pipe *p,
+ const char *uuid, uint_t version,
+ const char *domain,
+ const char *username,
+ const char *password,
+ uint8_t auth_type)
+{
+ NTSTATUS status;
+
+ if (!(p->conn->flags & (DCERPC_SIGN | DCERPC_SEAL))) {
+ p->conn->flags |= DCERPC_CONNECT;
+ }
+
+ status = gensec_client_start(p, &p->conn->security_state.generic_state);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start GENSEC client mode: %s\n", nt_errstr(status)));
+ return status;
+ }
+
+ status = gensec_set_domain(p->conn->security_state.generic_state, domain);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start set GENSEC client domain to %s: %s\n",
+ domain, nt_errstr(status)));
+ return status;
+ }
+
+ status = gensec_set_username(p->conn->security_state.generic_state, username);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start set GENSEC client username to %s: %s\n",
+ username, nt_errstr(status)));
+ return status;
+ }
+
+ status = gensec_set_password(p->conn->security_state.generic_state, password);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start set GENSEC client password: %s\n",
+ nt_errstr(status)));
+ return status;
+ }
+
+ status = gensec_set_target_hostname(p->conn->security_state.generic_state,
+ p->conn->transport.peer_name(p->conn));
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start set GENSEC target hostname: %s\n",
+ nt_errstr(status)));
+ return status;
+ }
+
+ status = gensec_start_mech_by_authtype(p->conn->security_state.generic_state,
+ auth_type,
+ dcerpc_auth_level(p->conn));
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start set GENSEC client mechanism %s: %s\n",
+ gensec_get_name_by_authtype(auth_type), nt_errstr(status)));
+ return status;
+ }
+
+ status = dcerpc_bind_auth(p, auth_type,
+ dcerpc_auth_level(p->conn),
+ uuid, version);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(2, ("Failed to bind to pipe with %s: %s\n",
+ gensec_get_name_by_authtype(auth_type), nt_errstr(status)));
+ return status;
+ }
+
+ return status;
+}
diff --git a/source4/librpc/rpc/dcerpc_ntlm.c b/source4/librpc/rpc/dcerpc_ntlm.c
deleted file mode 100644
index 39b5e1c28c..0000000000
--- a/source4/librpc/rpc/dcerpc_ntlm.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- dcerpc authentication operations
-
- Copyright (C) Andrew Tridgell 2003
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-/*
- do ntlm style authentication on a gensec pipe
-*/
-NTSTATUS dcerpc_bind_auth_ntlm(struct dcerpc_pipe *p,
- const char *uuid, uint_t version,
- const char *domain,
- const char *username,
- const char *password)
-{
- NTSTATUS status;
-
- if (!(p->conn->flags & (DCERPC_SIGN | DCERPC_SEAL))) {
- p->conn->flags |= DCERPC_CONNECT;
- }
-
- status = gensec_client_start(p, &p->conn->security_state.generic_state);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start GENSEC client mode: %s\n", nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_domain(p->conn->security_state.generic_state, domain);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client domain to %s: %s\n",
- domain, nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_username(p->conn->security_state.generic_state, username);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client username to %s: %s\n",
- username, nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_password(p->conn->security_state.generic_state, password);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client password: %s\n",
- nt_errstr(status)));
- return status;
- }
-
- status = gensec_start_mech_by_authtype(p->conn->security_state.generic_state,
- DCERPC_AUTH_TYPE_NTLMSSP, dcerpc_auth_level(p->conn));
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client NTLMSSP mechanism: %s\n",
- nt_errstr(status)));
- return status;
- }
-
- status = dcerpc_bind_auth(p, DCERPC_AUTH_TYPE_NTLMSSP,
- dcerpc_auth_level(p->conn),
- uuid, version);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(2, ("Failed to bind to pipe with NTLMSSP: %s\n", nt_errstr(status)));
- return status;
- }
-
- return status;
-}
diff --git a/source4/librpc/rpc/dcerpc_spnego.c b/source4/librpc/rpc/dcerpc_spnego.c
deleted file mode 100644
index 7290139f6e..0000000000
--- a/source4/librpc/rpc/dcerpc_spnego.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- dcerpc authentication operations
-
- Copyright (C) Stefan Metzmacher 2004
- Copyright (C) Andrew Tridgell 2003-2005
- Copyright (C) Andrew Bartlett 2004
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-/*
- do spnego style authentication on a gensec pipe
-*/
-NTSTATUS dcerpc_bind_auth_spnego(struct dcerpc_pipe *p,
- const char *uuid, uint_t version,
- const char *domain,
- const char *username,
- const char *password)
-{
- NTSTATUS status;
-
- if (!(p->conn->flags & (DCERPC_SIGN | DCERPC_SEAL))) {
- p->conn->flags |= DCERPC_CONNECT;
- }
-
- status = gensec_client_start(p, &p->conn->security_state.generic_state);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start GENSEC client mode: %s\n", nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_domain(p->conn->security_state.generic_state, domain);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client domain to %s: %s\n",
- domain, nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_username(p->conn->security_state.generic_state, username);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client username to %s: %s\n",
- username, nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_password(p->conn->security_state.generic_state, password);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client password: %s\n",
- nt_errstr(status)));
- return status;
- }
-
- status = gensec_set_target_hostname(p->conn->security_state.generic_state,
- p->conn->transport.peer_name(p->conn));
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC target hostname: %s\n",
- nt_errstr(status)));
- return status;
- }
-
- status = gensec_start_mech_by_authtype(p->conn->security_state.generic_state,
- DCERPC_AUTH_TYPE_SPNEGO,
- dcerpc_auth_level(p->conn));
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start set GENSEC client SPNEGO mechanism: %s\n",
- nt_errstr(status)));
- return status;
- }
-
- status = dcerpc_bind_auth(p, DCERPC_AUTH_TYPE_SPNEGO,
- dcerpc_auth_level(p->conn),
- uuid, version);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(2, ("Failed to bind to pipe with SPNEGO: %s\n", nt_errstr(status)));
- return status;
- }
-
- return status;
-}
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 992368777c..b815f5317d 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -785,7 +785,6 @@ static NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p,
const char *password)
{
NTSTATUS status;
-
p->conn->flags = binding->flags;
/* remember the binding string for possible secondary connections */
@@ -794,10 +793,17 @@ static NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p,
if (username && username[0] && (binding->flags & DCERPC_SCHANNEL_ANY)) {
status = dcerpc_bind_auth_schannel(p, pipe_uuid, pipe_version,
domain, username, password);
- } else if (username && username[0] && (binding->flags & DCERPC_AUTH_SPNEGO)) {
- status = dcerpc_bind_auth_spnego(p, pipe_uuid, pipe_version, domain, username, password);
} else if (username && username[0]) {
- status = dcerpc_bind_auth_ntlm(p, pipe_uuid, pipe_version, domain, username, password);
+ uint8_t auth_type;
+ if (binding->flags & DCERPC_AUTH_SPNEGO) {
+ auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+ } else {
+ auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+ }
+
+ status = dcerpc_bind_auth_password(p, pipe_uuid, pipe_version,
+ domain, username, password,
+ auth_type);
} else {
status = dcerpc_bind_auth_none(p, pipe_uuid, pipe_version);
}
generated by cgit (git 2.34.1) at 2024-12-05 03:54:36 +0000