[SCM] Samba Shared Repository - branch master updated
Simo Sorce
idra at samba.org
Wed Jan 27 12:03:43 MST 2010
The branch, master has been updated
via b63b9bc... s4:windc move windc plugin in its own file
via 1f2e9e9... s4:PAC make common functions public
via 82a80b7... s4:PAC Streamline pac-glue step 2
via 85e3561... s4:PAC Streamline pac-glue
from 6bade10... s3: get pthread detection also on HP-UX right
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b63b9bcd42e864d4b7024944c9d0b467487348f0
Author: Simo Sorce <idra at samba.org>
Date: Tue Jan 26 11:56:16 2010 -0500
s4:windc move windc plugin in its own file
Keep all heimdal related plugin code within wdc-samba4.c
Leave only interfaces common to multiple plugins in pac-glue.c
commit 1f2e9e90bdbd609dc6316c6dd71faa25a0138915
Author: Simo Sorce <idra at samba.org>
Date: Tue Jan 26 11:43:54 2010 -0500
s4:PAC make common functions public
commit 82a80b7f71d549e93995603a20ba119003c923fa
Author: Simo Sorce <idra at samba.org>
Date: Tue Jan 26 11:09:32 2010 -0500
s4:PAC Streamline pac-glue step 2
Split functions so that no assumption is made about which plugin
is using them
commit 85e3561dc9883aa957de85ad2ff82e0cc13c81b4
Author: Simo Sorce <idra at samba.org>
Date: Tue Jan 26 11:06:00 2010 -0500
s4:PAC Streamline pac-glue
First step, preparing to share the code between multiple plugins.
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/config.mk | 18 +++-
source4/kdc/kdc.c | 1 +
source4/kdc/kdc.h | 2 -
source4/kdc/pac-glue.c | 274 ++++++++++++++--------------------------------
source4/kdc/pac-glue.h | 46 ++++++++
source4/kdc/wdc-samba4.c | 212 +++++++++++++++++++++++++++++++++++
6 files changed, 357 insertions(+), 196 deletions(-)
create mode 100644 source4/kdc/pac-glue.h
create mode 100644 source4/kdc/wdc-samba4.c
Changeset truncated at 500 lines:
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 1659941..c3fc550 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -6,7 +6,7 @@
INIT_FUNCTION = server_service_kdc_init
SUBSYSTEM = service
PRIVATE_DEPENDENCIES = \
- HEIMDAL_KDC HDB_SAMBA4 PAC_GLUE LIBSAMBA-HOSTCONFIG \
+ HEIMDAL_KDC HDB_SAMBA4 WDC_SAMBA4 LIBSAMBA-HOSTCONFIG \
LIBTSOCKET LIBSAMBA_TSOCKET
# End SUBSYSTEM KDC
#######################
@@ -14,18 +14,30 @@ PRIVATE_DEPENDENCIES = \
KDC_OBJ_FILES = $(addprefix $(kdcsrcdir)/, kdc.o kpasswdd.o)
#######################
-# Start SUBSYSTEM KDC
+# Start SUBSYSTEM HDB
[SUBSYSTEM::HDB_SAMBA4]
CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
PRIVATE_DEPENDENCIES = \
LIBLDB auth_sam auth_sam_reply CREDENTIALS \
HEIMDAL_HDB LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM KDC
+# End SUBSYSTEM HDB
#######################
HDB_SAMBA4_OBJ_FILES = $(addprefix $(kdcsrcdir)/, hdb-samba4.o)
#######################
+# Start SUBSYSTEM WDC
+[SUBSYSTEM::WDC_SAMBA4]
+CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
+PRIVATE_DEPENDENCIES = \
+ LIBLDB auth_sam auth_sam_reply CREDENTIALS \
+ HEIMDAL_HDB PAC_GLUE LIBSAMBA-HOSTCONFIG
+# End SUBSYSTEM WDC
+#######################
+
+WDC_SAMBA4_OBJ_FILES = $(addprefix $(kdcsrcdir)/, wdc-samba4.o)
+
+#######################
# Start SUBSYSTEM KDC
[SUBSYSTEM::PAC_GLUE]
CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 026eaf4..86d0382 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -48,6 +48,7 @@
TALLOC_CTX *hdb_samba4_mem_ctx;
struct tevent_context *hdb_samba4_ev_ctx;
struct loadparm_context *hdb_samba4_lp_ctx;
+extern struct krb5plugin_windc_ftable windc_plugin_table;
typedef bool (*kdc_process_fn_t)(struct kdc_server *kdc,
TALLOC_CTX *mem_ctx,
diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index becef93..57f05e8 100644
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -30,8 +30,6 @@
struct kdc_server;
struct tsocket_address;
-extern struct krb5plugin_windc_ftable windc_plugin_table;
-
bool kpasswdd_process(struct kdc_server *kdc,
TALLOC_CTX *mem_ctx,
DATA_BLOB *input,
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index d921899..3c6b10e 100644
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -4,6 +4,7 @@
PAC Glue between Samba and the KDC
Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005-2009
+ Copyright (C) Simo Sorce <idra at samba.org> 2010
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
@@ -31,59 +32,53 @@
#include "kdc/kdc.h"
#include "param/param.h"
-struct krb5_dh_moduli;
-struct _krb5_krb_auth_data;
-
-static krb5_error_code samba_kdc_plugin_init(krb5_context context, void **ptr)
-{
- *ptr = NULL;
- return 0;
-}
-
-static void samba_kdc_plugin_fini(void *ptr)
+NTSTATUS samba_get_logon_info_pac_blob(TALLOC_CTX *mem_ctx,
+ struct smb_iconv_convenience *ic,
+ struct auth_serversupplied_info *info,
+ DATA_BLOB *pac_data)
{
- return;
-}
-
-static krb5_error_code make_pac(krb5_context context,
- TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *iconv_convenience,
- struct auth_serversupplied_info *server_info,
- krb5_pac *pac)
-{
- union PAC_INFO info;
struct netr_SamInfo3 *info3;
- krb5_data pac_data;
- NTSTATUS nt_status;
+ union PAC_INFO pac_info;
enum ndr_err_code ndr_err;
- DATA_BLOB pac_out;
- krb5_error_code ret;
+ NTSTATUS nt_status;
- ZERO_STRUCT(info);
+ ZERO_STRUCT(pac_info);
- nt_status = auth_convert_server_info_saminfo3(mem_ctx, server_info, &info3);
+ nt_status = auth_convert_server_info_saminfo3(mem_ctx, info, &info3);
if (!NT_STATUS_IS_OK(nt_status)) {
- DEBUG(1, ("Getting Samba info failed: %s\n", nt_errstr(nt_status)));
- return EINVAL;
+ DEBUG(1, ("Getting Samba info failed: %s\n",
+ nt_errstr(nt_status)));
+ return nt_status;
}
- info.logon_info.info = talloc_zero(mem_ctx, struct PAC_LOGON_INFO);
+ pac_info.logon_info.info = talloc_zero(mem_ctx, struct PAC_LOGON_INFO);
if (!mem_ctx) {
- return ENOMEM;
+ return NT_STATUS_NO_MEMORY;
}
- info.logon_info.info->info3 = *info3;
+ pac_info.logon_info.info->info3 = *info3;
- ndr_err = ndr_push_union_blob(&pac_out, mem_ctx, iconv_convenience, &info,
+ ndr_err = ndr_push_union_blob(pac_data, mem_ctx, ic, &pac_info,
PAC_TYPE_LOGON_INFO,
(ndr_push_flags_fn_t)ndr_push_PAC_INFO);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
nt_status = ndr_map_error2ntstatus(ndr_err);
- DEBUG(1, ("PAC (presig) push failed: %s\n", nt_errstr(nt_status)));
- return EINVAL;
+ DEBUG(1, ("PAC (presig) push failed: %s\n",
+ nt_errstr(nt_status)));
+ return nt_status;
}
- ret = krb5_data_copy(&pac_data, pac_out.data, pac_out.length);
+ return NT_STATUS_OK;
+}
+
+krb5_error_code samba_make_krb5_pac(krb5_context context,
+ DATA_BLOB *pac_blob,
+ krb5_pac *pac)
+{
+ krb5_data pac_data;
+ krb5_error_code ret;
+
+ ret = krb5_data_copy(&pac_data, pac_blob->data, pac_blob->length);
if (ret != 0) {
return ret;
}
@@ -103,28 +98,40 @@ static krb5_error_code make_pac(krb5_context context,
return ret;
}
-/* Given the right private pointer from hdb_samba4, get a PAC from the attached ldb messages */
-static krb5_error_code samba_kdc_get_pac(void *priv,
- krb5_context context,
- struct hdb_entry_ex *client,
- krb5_pac *pac)
+bool samba_princ_needs_pac(struct hdb_entry_ex *princ)
{
- krb5_error_code ret;
- NTSTATUS nt_status;
- struct auth_serversupplied_info *server_info;
- struct hdb_samba4_private *p = talloc_get_type(client->ctx, struct hdb_samba4_private);
- TALLOC_CTX *mem_ctx = talloc_named(p, 0, "samba_get_pac context");
+
+ struct hdb_samba4_private *p = talloc_get_type(princ->ctx, struct hdb_samba4_private);
unsigned int userAccountControl;
- if (!mem_ctx) {
- return ENOMEM;
- }
- /* The user account may be set not to want the PAC */
+ /* The service account may be set not to want the PAC */
userAccountControl = ldb_msg_find_attr_as_uint(p->msg, "userAccountControl", 0);
if (userAccountControl & UF_NO_AUTH_DATA_REQUIRED) {
- *pac = NULL;
- return 0;
+ return false;
+ }
+
+ return true;
+}
+
+NTSTATUS samba_kdc_get_pac_blob(TALLOC_CTX *mem_ctx,
+ struct hdb_entry_ex *client,
+ DATA_BLOB **_pac_blob)
+{
+ struct hdb_samba4_private *p = talloc_get_type(client->ctx, struct hdb_samba4_private);
+ struct auth_serversupplied_info *server_info;
+ DATA_BLOB *pac_blob;
+ NTSTATUS nt_status;
+
+ /* The user account may be set not to want the PAC */
+ if ( ! samba_princ_needs_pac(client)) {
+ *_pac_blob = NULL;
+ return NT_STATUS_OK;
+ }
+
+ pac_blob = talloc_zero(mem_ctx, DATA_BLOB);
+ if (!pac_blob) {
+ return NT_STATUS_NO_MEMORY;
}
nt_status = authsam_make_server_info(mem_ctx, p->samdb,
@@ -138,63 +145,45 @@ static krb5_error_code samba_kdc_get_pac(void *priv,
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Getting user info for PAC failed: %s\n",
nt_errstr(nt_status)));
- return ENOMEM;
+ return nt_status;
}
- ret = make_pac(context, mem_ctx, p->iconv_convenience, server_info, pac);
+ nt_status = samba_get_logon_info_pac_blob(mem_ctx,
+ p->iconv_convenience,
+ server_info, pac_blob);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ DEBUG(0, ("Building PAC failed: %s\n",
+ nt_errstr(nt_status)));
+ return nt_status;
+ }
- talloc_free(mem_ctx);
- return ret;
+ *_pac_blob = pac_blob;
+ return NT_STATUS_OK;
}
-/* Resign (and reform, including possibly new groups) a PAC */
-
-static krb5_error_code samba_kdc_reget_pac(void *priv, krb5_context context,
- const krb5_principal client_principal,
- struct hdb_entry_ex *client,
- struct hdb_entry_ex *server, krb5_pac *pac)
+NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx,
+ krb5_context context,
+ struct smb_iconv_convenience *ic,
+ krb5_pac *pac, DATA_BLOB *pac_blob)
{
+ struct auth_serversupplied_info *server_info;
krb5_error_code ret;
+ NTSTATUS nt_status;
- unsigned int userAccountControl;
-
- struct hdb_samba4_private *p = talloc_get_type(server->ctx, struct hdb_samba4_private);
-
- struct auth_serversupplied_info *server_info_out;
-
- TALLOC_CTX *mem_ctx = talloc_named(p, 0, "samba_get_pac context");
-
- if (!mem_ctx) {
- return ENOMEM;
- }
-
- /* The service account may be set not to want the PAC */
- userAccountControl = ldb_msg_find_attr_as_uint(p->msg, "userAccountControl", 0);
- if (userAccountControl & UF_NO_AUTH_DATA_REQUIRED) {
- talloc_free(mem_ctx);
- *pac = NULL;
- return 0;
- }
-
- ret = kerberos_pac_to_server_info(mem_ctx, p->iconv_convenience,
- *pac, context, &server_info_out);
-
- /* We will compleatly regenerate this pac */
- krb5_pac_free(context, *pac);
-
+ ret = kerberos_pac_to_server_info(mem_ctx, ic, *pac,
+ context, &server_info);
if (ret) {
- talloc_free(mem_ctx);
- return ret;
+ return NT_STATUS_UNSUCCESSFUL;
}
- ret = make_pac(context, mem_ctx, p->iconv_convenience, server_info_out, pac);
+ nt_status = samba_get_logon_info_pac_blob(mem_ctx, ic,
+ server_info, pac_blob);
- talloc_free(mem_ctx);
- return ret;
+ return nt_status;
}
-static void samba_kdc_build_edata_reply(TALLOC_CTX *tmp_ctx, krb5_data *e_data,
- NTSTATUS nt_status)
+void samba_kdc_build_edata_reply(TALLOC_CTX *tmp_ctx, krb5_data *e_data,
+ NTSTATUS nt_status)
{
PA_DATA pa;
unsigned char *buf;
@@ -226,100 +215,3 @@ static void samba_kdc_build_edata_reply(TALLOC_CTX *tmp_ctx, krb5_data *e_data,
return;
}
-/* Given an hdb entry (and in particular it's private member), consult
- * the account_ok routine in auth/auth_sam.c for consistancy */
-
-
-static krb5_error_code samba_kdc_check_client_access(void *priv,
- krb5_context context,
- krb5_kdc_configuration *config,
- hdb_entry_ex *client_ex, const char *client_name,
- hdb_entry_ex *server_ex, const char *server_name,
- KDC_REQ *req,
- krb5_data *e_data)
-{
- krb5_error_code ret;
- NTSTATUS nt_status;
- TALLOC_CTX *tmp_ctx;
- struct hdb_samba4_private *p;
- char *workstation = NULL;
- HostAddresses *addresses = req->req_body.addresses;
- int i;
- bool password_change;
-
- tmp_ctx = talloc_new(client_ex->ctx);
- p = talloc_get_type(client_ex->ctx, struct hdb_samba4_private);
-
- if (!tmp_ctx) {
- return ENOMEM;
- }
-
- if (addresses) {
- for (i=0; i < addresses->len; i++) {
- if (addresses->val->addr_type == KRB5_ADDRESS_NETBIOS) {
- workstation = talloc_strndup(tmp_ctx, addresses->val->address.data, MIN(addresses->val->address.length, 15));
- if (workstation) {
- break;
- }
- }
- }
- }
-
- /* Strip space padding */
- if (workstation) {
- i = MIN(strlen(workstation), 15);
- for (; i > 0 && workstation[i - 1] == ' '; i--) {
- workstation[i - 1] = '\0';
- }
- }
-
- password_change = (server_ex && server_ex->entry.flags.change_pw);
-
- /* we allow all kinds of trusts here */
- nt_status = authsam_account_ok(tmp_ctx,
- p->samdb,
- MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT | MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT,
- p->realm_dn,
- p->msg,
- workstation,
- client_name, true, password_change);
-
- if (NT_STATUS_IS_OK(nt_status)) {
- /* Now do the standard Heimdal check */
- ret = kdc_check_flags(context, config,
- client_ex, client_name,
- server_ex, server_name,
- req->msg_type == krb_as_req);
- } else {
- if (NT_STATUS_EQUAL(nt_status, NT_STATUS_PASSWORD_MUST_CHANGE))
- ret = KRB5KDC_ERR_KEY_EXPIRED;
- else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_PASSWORD_EXPIRED))
- ret = KRB5KDC_ERR_KEY_EXPIRED;
- else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCOUNT_EXPIRED))
- ret = KRB5KDC_ERR_CLIENT_REVOKED;
- else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCOUNT_DISABLED))
- ret = KRB5KDC_ERR_CLIENT_REVOKED;
- else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_INVALID_LOGON_HOURS))
- ret = KRB5KDC_ERR_CLIENT_REVOKED;
- else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCOUNT_LOCKED_OUT))
- ret = KRB5KDC_ERR_CLIENT_REVOKED;
- else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_INVALID_WORKSTATION))
- ret = KRB5KDC_ERR_POLICY;
- else
- ret = KRB5KDC_ERR_POLICY;
-
- samba_kdc_build_edata_reply(tmp_ctx, e_data, nt_status);
- }
-
- return ret;
-}
-
-struct krb5plugin_windc_ftable windc_plugin_table = {
- .minor_version = KRB5_WINDC_PLUGING_MINOR,
- .init = samba_kdc_plugin_init,
- .fini = samba_kdc_plugin_fini,
- .pac_generate = samba_kdc_get_pac,
- .pac_verify = samba_kdc_reget_pac,
- .client_access = samba_kdc_check_client_access,
-};
-
diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
new file mode 100644
index 0000000..5cc123f
--- /dev/null
+++ b/source4/kdc/pac-glue.h
@@ -0,0 +1,46 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ PAC Glue between Samba and the KDC
+
+ Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005-2009
+ Copyright (C) Simo Sorce <idra at samba.org> 2010
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+
+NTSTATUS samba_get_logon_info_pac_blob(TALLOC_CTX *mem_ctx,
+ struct smb_iconv_convenience *ic,
+ struct auth_serversupplied_info *info,
+ DATA_BLOB *pac_data);
+
+krb5_error_code samba_make_krb5_pac(krb5_context context,
+ DATA_BLOB *pac_blob,
+ krb5_pac *pac);
+
+bool samba_princ_needs_pac(struct hdb_entry_ex *princ);
+
+NTSTATUS samba_kdc_get_pac_blob(TALLOC_CTX *mem_ctx,
+ struct hdb_entry_ex *client,
+ DATA_BLOB **_pac_blob);
+
+NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx,
+ krb5_context context,
+ struct smb_iconv_convenience *ic,
+ krb5_pac *pac, DATA_BLOB *pac_blob);
+
+void samba_kdc_build_edata_reply(TALLOC_CTX *tmp_ctx, krb5_data *e_data,
+ NTSTATUS nt_status);
diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
new file mode 100644
index 0000000..2ff266e
--- /dev/null
+++ b/source4/kdc/wdc-samba4.c
@@ -0,0 +1,212 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ PAC Glue between Samba and the KDC
+
+ Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005-2009
+ Copyright (C) Simo Sorce <idra at samba.org> 2010
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list