diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-11-22 13:29:02 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-11-22 13:29:02 +0000 |
commit | 354c0fbc91c49f71c4760f88c0fb9e7fba11413c (patch) | |
tree | 5874890e27f569ae0ccb9e02c81bc88f6db0ab73 /source3/include | |
parent | a2b82b408b528a99037a390aabad867c25604836 (diff) | |
download | samba-354c0fbc91c49f71c4760f88c0fb9e7fba11413c.tar.gz samba-354c0fbc91c49f71c4760f88c0fb9e7fba11413c.tar.bz2 samba-354c0fbc91c49f71c4760f88c0fb9e7fba11413c.zip |
(merge from 3.0)
Changes all over the shop, but all towards:
- NTLM2 support in the server
- KEY_EXCH support in the server
- variable length session keys.
In detail:
- NTLM2 is an extension of NTLMv1, that is compatible with existing
domain controllers (unlike NTLMv2, which requires a DC upgrade).
* This is known as 'NTLMv2 session security' *
(This is not yet implemented on the RPC pipes however, so there may
well still be issues for PDC setups, particuarly around password
changes. We do not fully understand the sign/seal implications of
NTLM2 on RPC pipes.)
This requires modifications to our authentication subsystem, as we
must handle the 'challege' input into the challenge-response algorithm
being changed. This also needs to be turned off for
'security=server', which does not support this.
- KEY_EXCH is another 'security' mechanism, whereby the session key
actually used by the server is sent by the client, rather than being
the shared-secret directly or indirectly.
- As both these methods change the session key, the auth subsystem
needed to be changed, to 'override' session keys provided by the
backend.
- There has also been a major overhaul of the NTLMSSP subsystem, to
merge the 'client' and 'server' functions, so they both operate on a
single structure. This should help the SPNEGO implementation.
- The 'names blob' in NTLMSSP is always in unicode - never in ascii.
Don't make an ascii version ever.
- The other big change is to allow variable length session keys. We
have always assumed that session keys are 16 bytes long - and padded
to this length if shorter. However, Kerberos session keys are 8 bytes
long, when the krb5 login uses DES.
* This fix allows SMB signging on machines not yet running MIT KRB5 1.3.1. *
- Add better DEBUG() messages to ntlm_auth, warning administrators of
misconfigurations that prevent access to the privileged pipe. This
should help reduce some of the 'it just doesn't work' issues.
- Fix data_blob_talloc() to behave the same way data_blob() does when
passed a NULL data pointer. (just allocate)
REMEMBER to make clean after this commit - I have changed plenty of
data structures...
Andrew Bartlett
(This used to be commit 57a895aaabacc0c9147344d097d333793b77c947)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/auth.h | 7 | ||||
-rw-r--r-- | source3/include/client.h | 4 | ||||
-rw-r--r-- | source3/include/includes.h | 2 | ||||
-rw-r--r-- | source3/include/ntdomain.h | 2 | ||||
-rw-r--r-- | source3/include/ntlmssp.h | 98 | ||||
-rw-r--r-- | source3/include/smb.h | 2 |
6 files changed, 73 insertions, 42 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h index 6b42418be8..ecf4d539d8 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -87,10 +87,9 @@ typedef struct auth_serversupplied_info NT_USER_TOKEN *ptok; - uint8 session_key[16]; + DATA_BLOB nt_session_key; + DATA_BLOB lm_session_key; - uint8 first_8_lm_hash[8]; - uint32 sam_fill_level; /* How far is this structure filled? */ SAM_ACCOUNT *sam_account; @@ -107,6 +106,8 @@ struct auth_context { /* 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; diff --git a/source3/include/client.h b/source3/include/client.h index 598e6c0bda..968b73f0b4 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -113,7 +113,7 @@ struct cli_state { /* the session key for this CLI, outside any per-pipe authenticaion */ - unsigned char user_session_key[16]; + DATA_BLOB user_session_key; /* * Only used in NT domain calls. @@ -133,7 +133,7 @@ struct cli_state { schannel. */ struct netsec_auth_struct auth_info; - NTLMSSP_CLIENT_STATE *ntlmssp_pipe_state; + NTLMSSP_STATE *ntlmssp_pipe_state; unsigned char sess_key[16]; /* Current session key. */ DOM_CRED clnt_cred; /* Client credential. */ diff --git a/source3/include/includes.h b/source3/include/includes.h index 92c5f847dd..4e7913ea38 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1303,7 +1303,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); -BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16], BOOL remote); +BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, BOOL remote); #endif /* HAVE_KRB5 */ /* TRUE and FALSE are part of the C99 standard and gcc, but diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index d9fff4d2a9..eaedc7ea9b 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -245,7 +245,7 @@ typedef struct pipes_struct fstring pipe_user_name; struct current_user pipe_user; - uint8 session_key[16]; + DATA_BLOB session_key; /* * Set to true when an RPC bind has been done on this pipe. diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h index f1b1bc25e4..681d4071db 100644 --- a/source3/include/ntlmssp.h +++ b/source3/include/ntlmssp.h @@ -30,6 +30,7 @@ enum NTLMSSP_ROLE /* NTLMSSP message types */ enum NTLM_MESSAGE_TYPE { + NTLMSSP_INITIAL = 0 /* samba internal state */, NTLMSSP_NEGOTIATE = 1, NTLMSSP_CHALLENGE = 2, NTLMSSP_AUTH = 3, @@ -70,29 +71,10 @@ enum NTLM_MESSAGE_TYPE typedef struct ntlmssp_state { TALLOC_CTX *mem_ctx; + unsigned int ref_count; enum NTLMSSP_ROLE role; - BOOL unicode; - char *user; - char *domain; - char *workstation; - DATA_BLOB lm_resp; - DATA_BLOB nt_resp; - DATA_BLOB chal; - void *auth_context; - const uint8 *(*get_challenge)(struct ntlmssp_state *ntlmssp_state); - NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state); - - const char *(*get_global_myname)(void); - const char *(*get_domain)(void); - - int server_role; + enum server_types server_role; uint32 expected_state; -} NTLMSSP_STATE; - -typedef struct ntlmssp_client_state -{ - TALLOC_CTX *mem_ctx; - unsigned int ref_count; BOOL unicode; BOOL use_ntlmv2; @@ -102,30 +84,78 @@ typedef struct ntlmssp_client_state char *password; char *server_domain; - const char *(*get_global_myname)(void); - const char *(*get_domain)(void); + DATA_BLOB internal_chal; /* Random challenge as supplied to the client for NTLM authentication */ - DATA_BLOB chal; + DATA_BLOB chal; /* Random challenge as input into the actual NTLM (or NTLM2) authentication */ DATA_BLOB lm_resp; DATA_BLOB nt_resp; DATA_BLOB session_key; - uint32 neg_flags; + uint32 neg_flags; /* the current state of negotiation with the NTLMSSP partner */ + void *auth_context; + + /** + * Callback to get the 'challenge' used for NTLM authentication. + * + * @param ntlmssp_state This structure + * @return 8 bytes of challnege data, determined by the server to be the challenge for NTLM authentication + * + */ + const uint8 *(*get_challenge)(const struct ntlmssp_state *ntlmssp_state); + + /** + * Callback to find if the challenge used by NTLM authentication may be modified + * + * The NTLM2 authentication scheme modifies the effective challenge, but this is not compatiable with the + * current 'security=server' implementation.. + * + * @param ntlmssp_state This structure + * @return Can the challenge be set to arbitary values? + * + */ + BOOL (*may_set_challenge)(const struct ntlmssp_state *ntlmssp_state); + + /** + * Callback to set the 'challenge' used for NTLM authentication. + * + * The callback may use the void *auth_context to store state information, but the same value is always available + * from the DATA_BLOB chal on this structure. + * + * @param ntlmssp_state This structure + * @param challange 8 bytes of data, agreed by the client and server to be the effective challenge for NTLM2 authentication + * + */ + NTSTATUS (*set_challenge)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge); + + /** + * Callback to check the user's password. + * + * The callback must reads the feilds of this structure for the information it needs on the user + * @param ntlmssp_state This structure + * @param nt_session_key If an NT session key is returned by the authentication process, return it here + * @param lm_session_key If an LM session key is returned by the authentication process, return it here + * + */ + NTSTATUS (*check_password)(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key); + + const char *(*get_global_myname)(void); + const char *(*get_domain)(void); + /* SMB Signing */ uint32 ntlmssp_seq_num; /* ntlmv2 */ - char cli_sign_const[16]; - char cli_seal_const[16]; - char srv_sign_const[16]; - char srv_seal_const[16]; + char send_sign_const[16]; + char send_seal_const[16]; + char recv_sign_const[16]; + char recv_seal_const[16]; - unsigned char cli_sign_hash[258]; - unsigned char cli_seal_hash[258]; - unsigned char srv_sign_hash[258]; - unsigned char srv_seal_hash[258]; + unsigned char send_sign_hash[258]; + unsigned char send_seal_hash[258]; + unsigned char recv_sign_hash[258]; + unsigned char recv_seal_hash[258]; /* ntlmv1 */ unsigned char ntlmssp_hash[258]; @@ -135,5 +165,5 @@ typedef struct ntlmssp_client_state Store it here, until we need it */ DATA_BLOB stored_response; -} NTLMSSP_CLIENT_STATE; +} NTLMSSP_STATE; diff --git a/source3/include/smb.h b/source3/include/smb.h index 689e6ebe1d..bef6bef691 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1548,7 +1548,7 @@ typedef struct user_struct NT_USER_TOKEN *nt_user_token; - uint8 session_key[16]; + DATA_BLOB session_key; char *session_keystr; /* used by utmp and pam session code. TDB key string */ |