On Fri, Mar 19, 2021 at 06:37:05PM +0000, Jacob Champion wrote: > The same effect can be had by moving the log rotation to the top of the > test that needs it, so I've done it that way in v7.
After thinking more about 0001, I have come up with an even simpler solution that has resulted in 11e1577. That's similar to what PostgresNode::issues_sql_like() does. This also makes 0003 simpler with its changes as this requires to change two lines in test_access. > Turns out it's easy now to have our cake and eat it too; a single if > statement can implement the same search-forward functionality that was > spread across multiple places before. So I've done that too. I have briefly looked at 0002 (0001 in the attached set), and it seems sane to me. I still need to look at 0003 (well, now 0002) in details, which is very sensible as one mistake would likely be a CVE-class bug. -- Michael
From d82f7b15bb68011eb117c3409e455f05264194fb Mon Sep 17 00:00:00 2001 From: Jacob Champion <pchamp...@vmware.com> Date: Mon, 8 Feb 2021 10:53:20 -0800 Subject: [PATCH v8 1/2] ssl: store client's DN in port->peer_dn Original patch by Andrew Dunstan: https://www.postgresql.org/message-id/fd96ae76-a8e3-ef8e-a642-a592f5b76771%40dunslane.net but I've taken out the clientname=DN functionality; all that will be needed for the next patch is the DN string. --- src/include/libpq/libpq-be.h | 1 + src/backend/libpq/be-secure-openssl.c | 53 +++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 30fb4e613d..d970277894 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -190,6 +190,7 @@ typedef struct Port */ bool ssl_in_use; char *peer_cn; + char *peer_dn; bool peer_cert_valid; /* diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 5ce3f27855..18321703da 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -551,22 +551,25 @@ aloop: /* Get client certificate, if available. */ port->peer = SSL_get_peer_certificate(port->ssl); - /* and extract the Common Name from it. */ + /* and extract the Common Name / Distinguished Name from it. */ port->peer_cn = NULL; + port->peer_dn = NULL; port->peer_cert_valid = false; if (port->peer != NULL) { int len; + X509_NAME *x509name = X509_get_subject_name(port->peer); + char *peer_cn; + char *peer_dn; + BIO *bio = NULL; + BUF_MEM *bio_buf = NULL; - len = X509_NAME_get_text_by_NID(X509_get_subject_name(port->peer), - NID_commonName, NULL, 0); + len = X509_NAME_get_text_by_NID(x509name, NID_commonName, NULL, 0); if (len != -1) { - char *peer_cn; - peer_cn = MemoryContextAlloc(TopMemoryContext, len + 1); - r = X509_NAME_get_text_by_NID(X509_get_subject_name(port->peer), - NID_commonName, peer_cn, len + 1); + r = X509_NAME_get_text_by_NID(x509name, NID_commonName, peer_cn, + len + 1); peer_cn[len] = '\0'; if (r != len) { @@ -590,6 +593,36 @@ aloop: port->peer_cn = peer_cn; } + + bio = BIO_new(BIO_s_mem()); + if (!bio) + { + pfree(port->peer_cn); + port->peer_cn = NULL; + return -1; + } + /* use commas instead of slashes */ + X509_NAME_print_ex(bio, x509name, 0, XN_FLAG_RFC2253); + BIO_get_mem_ptr(bio, &bio_buf); + peer_dn = MemoryContextAlloc(TopMemoryContext, bio_buf->length + 1); + memcpy(peer_dn, bio_buf->data, bio_buf->length); + peer_dn[bio_buf->length] = '\0'; + if (bio_buf->length != strlen(peer_dn)) + { + ereport(COMMERROR, + (errcode(ERRCODE_PROTOCOL_VIOLATION), + errmsg("SSL certificate's distinguished name contains embedded null"))); + BIO_free(bio); + pfree(peer_dn); + pfree(port->peer_cn); + port->peer_cn = NULL; + return -1; + } + + BIO_free(bio); + + port->peer_dn = peer_dn; + port->peer_cert_valid = true; } @@ -618,6 +651,12 @@ be_tls_close(Port *port) pfree(port->peer_cn); port->peer_cn = NULL; } + + if (port->peer_dn) + { + pfree(port->peer_dn); + port->peer_dn = NULL; + } } ssize_t -- 2.31.0
From c2b9d514b5fe11aa2091de3f4cf81ba2f6fa0991 Mon Sep 17 00:00:00 2001 From: Michael Paquier <mich...@paquier.xyz> Date: Mon, 22 Mar 2021 15:08:04 +0900 Subject: [PATCH v8 2/2] Log authenticated identity from all auth backends The "authenticated identity" is the string used by an auth method to identify a particular user. In many common cases this is the same as the Postgres username, but for some third-party auth methods, the identifier in use may be shortened or otherwise translated (e.g. through pg_ident mappings) before the server stores it. To help DBAs see who has actually interacted with the system, store the original identity when authentication succeeds, and expose it via the log_connections setting. The log entries look something like this example (where a local user named "pchampion" is connecting to the database as the "admin" user): LOG: connection received: host=[local] LOG: connection authenticated: identity="pchampion" method=peer (/data/pg_hba.conf:88) LOG: connection authorized: user=admin database=postgres application_name=psql port->authn_id is set according to the auth method: bsd: the Postgres username (which is the local username) cert: the client's Subject DN gss: the user principal ident: the remote username ldap: the final bind DN pam: the Postgres username (which is the PAM username) password (and all pw-challenge methods): the Postgres username peer: the peer's pw_name radius: the Postgres username (which is the RADIUS username) sspi: either the down-level (SAM-compatible) logon name, if compat_realm=1, or the User Principal Name if compat_realm=0 The trust auth method does not set an authenticated identity. Neither does using clientcert=verify-full (use the cert auth method instead). The Kerberos test suite has been modified to let tests match multiple log lines in order. --- src/include/libpq/hba.h | 1 + src/include/libpq/libpq-be.h | 12 +++ src/backend/libpq/auth.c | 119 ++++++++++++++++++++-- src/backend/libpq/hba.c | 24 +++++ src/test/authentication/t/001_password.pl | 60 ++++++++++- src/test/kerberos/t/001_auth.pl | 34 +++++-- src/test/ldap/t/001_auth.pl | 28 ++++- src/test/ssl/t/001_ssltests.pl | 55 +++++++++- src/test/ssl/t/002_scram.pl | 53 +++++++++- doc/src/sgml/config.sgml | 2 +- 10 files changed, 367 insertions(+), 21 deletions(-) diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 8f09b5638f..7cc06808aa 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -130,6 +130,7 @@ typedef struct Port hbaPort; extern bool load_hba(void); extern bool load_ident(void); +extern const char *hba_authname(hbaPort *port); extern void hba_getauthmethod(hbaPort *port); extern int check_usermap(const char *usermap_name, const char *pg_role, const char *auth_user, diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index d970277894..a104f811f1 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -154,6 +154,18 @@ typedef struct Port */ HbaLine *hba; + /* + * Authenticated identity. The meaning of this identifier is dependent on + * hba->auth_method; it's the identity (if any) that the user presented + * during the authentication cycle, before they were assigned a role. (It's + * effectively the "SYSTEM-USERNAME" of a pg_ident usermap -- though the + * exact string in use may be different, depending on pg_hba options.) + * + * authn_id is NULL if the user has not actually been authenticated, for + * example if the "trust" auth method is in use. + */ + const char *authn_id; + /* * TCP keepalive and user timeout settings. * diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 994251e7d9..bfcffbdb3b 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -34,8 +34,10 @@ #include "libpq/scram.h" #include "miscadmin.h" #include "port/pg_bswap.h" +#include "postmaster/postmaster.h" #include "replication/walsender.h" #include "storage/ipc.h" +#include "utils/guc.h" #include "utils/memutils.h" #include "utils/timestamp.h" @@ -47,6 +49,7 @@ static void sendAuthRequest(Port *port, AuthRequest areq, const char *extradata, int extralen); static void auth_failed(Port *port, int status, char *logdetail); static char *recv_password_packet(Port *port); +static void set_authn_id(Port *port, const char *id); /*---------------------------------------------------------------- @@ -337,6 +340,47 @@ auth_failed(Port *port, int status, char *logdetail) } +/* + * Sets the authenticated identity for the current user. The provided string + * will be copied into the TopMemoryContext. The ID will be logged if + * log_connections is enabled. + * + * Auth methods should call this exactly once, as soon as the user is + * successfully authenticated, even if they have reason to know that + * authorization will fail later. + */ +static void +set_authn_id(Port *port, const char *id) +{ + Assert(id); + + if (port->authn_id) + { + /* + * An existing authn_id should never be overwritten; that means two + * authentication providers are fighting (or one is fighting itself). + * Don't leak any authn details to the client, but don't let the + * connection continue, either. + */ + ereport(FATAL, + (errmsg("connection was re-authenticated"), + errdetail_log("previous ID: \"%s\"; new ID: \"%s\"", + port->authn_id, id))); + } + + port->authn_id = MemoryContextStrdup(TopMemoryContext, id); + + if (Log_connections) + { + ereport(LOG, + errmsg("connection authenticated: identity=\"%s\" method=%s " + "(%s:%d)", + port->authn_id, hba_authname(port), HbaFileName, + port->hba->linenumber)); + } +} + + /* * Client authentication starts here. If there is an error, this * function does not return and the backend process is terminated. @@ -757,6 +801,9 @@ CheckPasswordAuth(Port *port, char **logdetail) pfree(shadow_pass); pfree(passwd); + if (result == STATUS_OK) + set_authn_id(port, port->user_name); + return result; } @@ -816,6 +863,10 @@ CheckPWChallengeAuth(Port *port, char **logdetail) Assert(auth_result != STATUS_OK); return STATUS_ERROR; } + + if (auth_result == STATUS_OK) + set_authn_id(port, port->user_name); + return auth_result; } @@ -1173,9 +1224,10 @@ pg_GSS_checkauth(Port *port) /* * Copy the original name of the authenticated principal into our backend - * memory for display later. + * memory for display later. This is also our authenticated identity. */ port->gss->princ = MemoryContextStrdup(TopMemoryContext, gbuf.value); + set_authn_id(port, gbuf.value); /* * Split the username at the realm separator @@ -1285,6 +1337,7 @@ pg_SSPI_recvauth(Port *port) DWORD domainnamesize = sizeof(domainname); SID_NAME_USE accountnameuse; HMODULE secur32; + char *authn_id; QUERY_SECURITY_CONTEXT_TOKEN_FN _QuerySecurityContextToken; @@ -1514,6 +1567,24 @@ pg_SSPI_recvauth(Port *port) return status; } + /* + * We have all of the information necessary to construct the authenticated + * identity. + */ + if (port->hba->compat_realm) + { + /* SAM-compatible format. */ + authn_id = psprintf("%s\\%s", domainname, accountname); + } + else + { + /* Kerberos principal format. */ + authn_id = psprintf("%s@%s", accountname, domainname); + } + + set_authn_id(port, authn_id); + pfree(authn_id); + /* * Compare realm/domain if requested. In SSPI, always compare case * insensitive. @@ -1901,8 +1972,11 @@ ident_inet_done: pg_freeaddrinfo_all(local_addr.addr.ss_family, la); if (ident_return) - /* Success! Check the usermap */ + { + /* Success! Store the identity and check the usermap */ + set_authn_id(port, ident_user); return check_usermap(port->hba->usermap, port->user_name, ident_user, false); + } return STATUS_ERROR; } @@ -1926,7 +2000,6 @@ auth_peer(hbaPort *port) gid_t gid; #ifndef WIN32 struct passwd *pw; - char *peer_user; int ret; #endif @@ -1958,12 +2031,13 @@ auth_peer(hbaPort *port) return STATUS_ERROR; } - /* Make a copy of static getpw*() result area. */ - peer_user = pstrdup(pw->pw_name); + /* + * Make a copy of static getpw*() result area. This is our authenticated + * identity. + */ + set_authn_id(port, pw->pw_name); - ret = check_usermap(port->hba->usermap, port->user_name, peer_user, false); - - pfree(peer_user); + ret = check_usermap(port->hba->usermap, port->user_name, port->authn_id, false); return ret; #else @@ -2220,6 +2294,9 @@ CheckPAMAuth(Port *port, const char *user, const char *password) pam_passwd = NULL; /* Unset pam_passwd */ + if (retval == PAM_SUCCESS) + set_authn_id(port, user); + return (retval == PAM_SUCCESS ? STATUS_OK : STATUS_ERROR); } #endif /* USE_PAM */ @@ -2255,6 +2332,7 @@ CheckBSDAuth(Port *port, char *user) if (!retval) return STATUS_ERROR; + set_authn_id(port, user); return STATUS_OK; } #endif /* USE_BSD_AUTH */ @@ -2761,6 +2839,9 @@ CheckLDAPAuth(Port *port) return STATUS_ERROR; } + /* Save the original bind DN as the authenticated identity. */ + set_authn_id(port, fulluser); + ldap_unbind(ldap); pfree(passwd); pfree(fulluser); @@ -2813,6 +2894,26 @@ CheckCertAuth(Port *port) return STATUS_ERROR; } + if (port->hba->auth_method == uaCert) + { + /* + * The client's Subject DN is our authenticated identity. + */ + if (!port->peer_dn) + { + /* + * Unlikely to happen (after all, we were able to get the subject + * CN). This probably indicates problems with the TLS backend. + */ + ereport(LOG, + (errmsg("certificate authentication failed for user \"%s\": unable to retrieve subject DN", + port->user_name))); + return STATUS_ERROR; + } + + set_authn_id(port, port->peer_dn); + } + /* Just pass the certificate cn to the usermap check */ status_check_usermap = check_usermap(port->hba->usermap, port->user_name, port->peer_cn, false); if (status_check_usermap != STATUS_OK) @@ -2975,6 +3076,8 @@ CheckRADIUSAuth(Port *port) */ if (ret == STATUS_OK) { + set_authn_id(port, port->user_name); + pfree(passwd); return STATUS_OK; } diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 9a04c093d5..aa15877ef7 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -3110,3 +3110,27 @@ hba_getauthmethod(hbaPort *port) { check_hba(port); } + + +/* + * Return the name of the auth method in use ("gss", "md5", "trust", etc.). + * + * The return value is statically allocated (see the UserAuthName array) and + * should not be freed. + */ +const char * +hba_authname(hbaPort *port) +{ + UserAuth auth_method; + + Assert(port->hba); + auth_method = port->hba->auth_method; + + if (auth_method < 0 || USER_AUTH_LAST < auth_method) + { + Assert((0 <= auth_method) && (auth_method <= USER_AUTH_LAST)); + return NULL; + } + + return UserAuthName[auth_method]; +} diff --git a/src/test/authentication/t/001_password.pl b/src/test/authentication/t/001_password.pl index 36a616d7c7..3ac137aebd 100644 --- a/src/test/authentication/t/001_password.pl +++ b/src/test/authentication/t/001_password.pl @@ -17,7 +17,7 @@ if (!$use_unix_sockets) } else { - plan tests => 13; + plan tests => 19; } @@ -57,6 +57,7 @@ sub test_role # Initialize primary node my $node = get_new_node('primary'); $node->init; +$node->append_conf('postgresql.conf', "log_connections = on\n"); $node->start; # Create 3 roles with different password methods for each one. The same @@ -69,27 +70,84 @@ $node->safe_psql('postgres', ); $ENV{"PGPASSWORD"} = 'pass'; +my $log = $node->rotate_logfile(); +$node->restart; + # For "trust" method, all users should be able to connect. reset_pg_hba($node, 'trust'); test_role($node, 'scram_role', 'trust', 0); test_role($node, 'md5_role', 'trust', 0); +$node->stop('fast'); +my $log_contents = slurp_file($log); + +unlike( + $log_contents, + qr/connection authenticated:/, + "trust method does not authenticate users"); + +$log = $node->rotate_logfile(); +$node->start; + # For plain "password" method, all users should also be able to connect. reset_pg_hba($node, 'password'); test_role($node, 'scram_role', 'password', 0); test_role($node, 'md5_role', 'password', 0); +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="scram_role" method=password/, + "password method logs authenticated identity"); + +$log = $node->rotate_logfile(); +$node->start; + # For "scram-sha-256" method, user "scram_role" should be able to connect. reset_pg_hba($node, 'scram-sha-256'); test_role($node, 'scram_role', 'scram-sha-256', 0); test_role($node, 'md5_role', 'scram-sha-256', 2); +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="scram_role" method=scram-sha-256/, + "scram-sha-256 method logs authenticated identity"); + +unlike( + $log_contents, + qr/connection authenticated: identity="md5_role"/, + "mismatched crypt methods do not result in authentication"); + +$log = $node->rotate_logfile(); +$node->start; + # For "md5" method, all users should be able to connect (SCRAM # authentication will be performed for the user with a SCRAM secret.) reset_pg_hba($node, 'md5'); test_role($node, 'scram_role', 'md5', 0); test_role($node, 'md5_role', 'md5', 0); +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="md5_role" method=md5/, + "md5 method logs authenticated identity"); + +like( + $log_contents, + qr/connection authenticated: identity="scram_role" method=md5/, + "md5 method logs authenticated identity for SCRAM users too"); + +$log = $node->rotate_logfile(); +$node->start; + # Tests for channel binding without SSL. # Using the password authentication method; channel binding can't work reset_pg_hba($node, 'password'); diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl index 38e9ef7b1f..00a2c6d3ea 100644 --- a/src/test/kerberos/t/001_auth.pl +++ b/src/test/kerberos/t/001_auth.pl @@ -20,7 +20,7 @@ use Time::HiRes qw(usleep); if ($ENV{with_gssapi} eq 'yes') { - plan tests => 26; + plan tests => 38; } else { @@ -182,7 +182,7 @@ note "running tests"; # Test connection success or failure, and if success, that query returns true. sub test_access { - my ($node, $role, $query, $expected_res, $gssencmode, $test_name, $expect_log_msg) = @_; + my ($node, $role, $query, $expected_res, $gssencmode, $test_name, @expect_log_msgs) = @_; # need to connect over TCP/IP for Kerberos my ($res, $stdoutres, $stderrres) = $node->psql( @@ -207,7 +207,7 @@ sub test_access } # Verify specified log message is logged in the log file. - if ($expect_log_msg ne '') + while (my $expect_log_msg = shift @expect_log_msgs) { my $first_logfile = slurp_file($node->logfile); @@ -249,11 +249,13 @@ $node->append_conf('pg_hba.conf', qq{host all all $hostaddr/32 gss map=mymap}); $node->restart; -test_access($node, 'test1', 'SELECT true', 2, '', 'fails without ticket', ''); +test_access($node, 'test1', 'SELECT true', 2, '', 'fails without ticket'); run_log [ $kinit, 'test1' ], \$test1_password or BAIL_OUT($?); -test_access($node, 'test1', 'SELECT true', 2, '', 'fails without mapping', ''); +test_access($node, 'test1', 'SELECT true', 2, '', 'fails without mapping', + "connection authenticated: identity=\"test1\@$realm\" method=gss", + "no match in usermap \"mymap\" for user \"test1\""); $node->append_conf('pg_ident.conf', qq{mymap /^(.*)\@$realm\$ \\1}); $node->restart; @@ -265,6 +267,7 @@ test_access( 0, '', 'succeeds with mapping with default gssencmode and host hba', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=yes, principal=test1\@$realm)" ); @@ -275,6 +278,7 @@ test_access( 0, 'gssencmode=prefer', 'succeeds with GSS-encrypted access preferred with host hba', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=yes, principal=test1\@$realm)" ); test_access( @@ -284,6 +288,7 @@ test_access( 0, 'gssencmode=require', 'succeeds with GSS-encrypted access required with host hba', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=yes, principal=test1\@$realm)" ); @@ -320,6 +325,7 @@ test_access( 0, 'gssencmode=prefer', 'succeeds with GSS-encrypted access preferred and hostgssenc hba', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=yes, principal=test1\@$realm)" ); test_access( @@ -329,10 +335,11 @@ test_access( 0, 'gssencmode=require', 'succeeds with GSS-encrypted access required and hostgssenc hba', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=yes, principal=test1\@$realm)" ); test_access($node, 'test1', 'SELECT true', 2, 'gssencmode=disable', - 'fails with GSS encryption disabled and hostgssenc hba', ''); + 'fails with GSS encryption disabled and hostgssenc hba'); unlink($node->data_dir . '/pg_hba.conf'); $node->append_conf('pg_hba.conf', @@ -346,10 +353,11 @@ test_access( 0, 'gssencmode=prefer', 'succeeds with GSS-encrypted access preferred and hostnogssenc hba, but no encryption', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=no, principal=test1\@$realm)" ); test_access($node, 'test1', 'SELECT true', 2, 'gssencmode=require', - 'fails with GSS-encrypted access required and hostnogssenc hba', ''); + 'fails with GSS-encrypted access required and hostnogssenc hba'); test_access( $node, 'test1', @@ -357,6 +365,7 @@ test_access( 0, 'gssencmode=disable', 'succeeds with GSS encryption disabled and hostnogssenc hba', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=no, principal=test1\@$realm)" ); @@ -373,5 +382,16 @@ test_access( 0, '', 'succeeds with include_realm=0 and defaults', + "connection authenticated: identity=\"test1\@$realm\" method=gss", "connection authorized: user=$username database=$dbname application_name=$application GSS (authenticated=yes, encrypted=yes, principal=test1\@$realm)" ); + +unlink($node->data_dir . '/pg_hba.conf'); +$node->append_conf('pg_hba.conf', + qq{host all all $hostaddr/32 gss include_realm=0 krb_realm=EXAMPLE.ORG}); +$node->restart; + +test_access($node, 'test1', 'SELECT true', 2, '', + 'fails with wrong krb_realm, but still authenticates', + "connection authenticated: identity=\"test1\@$realm\" method=gss" +); diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl index 3bc7672451..94f8850ca8 100644 --- a/src/test/ldap/t/001_auth.pl +++ b/src/test/ldap/t/001_auth.pl @@ -6,7 +6,7 @@ use Test::More; if ($ENV{with_ldap} eq 'yes') { - plan tests => 22; + plan tests => 24; } else { @@ -152,6 +152,7 @@ note "setting up PostgreSQL instance"; my $node = get_new_node('node'); $node->init; +$node->append_conf('postgresql.conf', "log_connections = on\n"); $node->start; $node->safe_psql('postgres', 'CREATE USER test0;'); @@ -173,6 +174,9 @@ sub test_access note "simple bind"; +# save log location for later tests +my $log = $node->rotate_logfile(); + unlink($node->data_dir . '/pg_hba.conf'); $node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapport=$ldap_port ldapprefix="uid=" ldapsuffix=",dc=example,dc=net"} @@ -184,9 +188,31 @@ test_access($node, 'test0', 2, 'simple bind authentication fails if user not found in LDAP'); test_access($node, 'test1', 2, 'simple bind authentication fails with wrong password'); + +$node->stop('fast'); +my $log_contents = slurp_file($log); + +unlike( + $log_contents, + qr/connection authenticated:/, + "unauthenticated DNs are not logged"); + +$log = $node->rotate_logfile(); +$node->start; + $ENV{"PGPASSWORD"} = 'secret1'; test_access($node, 'test1', 0, 'simple bind authentication succeeds'); +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="uid=test1,dc=example,dc=net" method=ldap/, + "authenticated DNs are logged"); + +$node->start; + note "search+bind"; unlink($node->data_dir . '/pg_hba.conf'); diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl index bfada03d3e..bb27f2e46d 100644 --- a/src/test/ssl/t/001_ssltests.pl +++ b/src/test/ssl/t/001_ssltests.pl @@ -17,7 +17,7 @@ if ($ENV{with_ssl} ne 'openssl') } else { - plan tests => 100; + plan tests => 104; } #### Some configuration @@ -417,6 +417,9 @@ test_connect_fails( qr/connection requires a valid client certificate/, "certificate authorization fails without client cert"); +my $log = $node->rotate_logfile(); +$node->restart; + # correct client cert in unencrypted PEM test_connect_ok( $common_connstr, @@ -424,6 +427,17 @@ test_connect_ok( "certificate authorization succeeds with correct client cert in PEM format" ); +# make sure certificate DNs are logged correctly +$node->stop('fast'); +my $log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="CN=ssltestuser" method=cert/, + "authenticated DNs are logged"); + +$node->start; + # correct client cert in unencrypted DER test_connect_ok( $common_connstr, @@ -509,6 +523,9 @@ SKIP: "certificate authorization fails because of file permissions"); } +$log = $node->rotate_logfile(); +$node->restart; + # client cert belonging to another user test_connect_fails( $common_connstr, @@ -517,6 +534,17 @@ test_connect_fails( "certificate authorization fails with client cert belonging to another user" ); +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="CN=ssltestuser" method=cert/, + "cert authentication succeeds even if authorization fails"); + +$log = $node->rotate_logfile(); +$node->restart; + # revoked client cert test_connect_fails( $common_connstr, @@ -524,12 +552,25 @@ test_connect_fails( qr/SSL error/, "certificate authorization fails with revoked client cert"); +$node->stop('fast'); +$log_contents = slurp_file($log); + +unlike( + $log_contents, + qr/connection authenticated:/, + "revoked certs do not authenticate users"); + +$node->start; + # Check that connecting with auth-option verify-full in pg_hba: # works, iff username matches Common Name # fails, iff username doesn't match Common Name. $common_connstr = "sslrootcert=ssl/root+server_ca.crt sslmode=require dbname=verifydb hostaddr=$SERVERHOSTADDR"; +$log = $node->rotate_logfile(); +$node->restart; + test_connect_ok( $common_connstr, "user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key", @@ -551,6 +592,18 @@ test_connect_ok( "auth_option clientcert=verify-ca succeeds with mismatching username and Common Name" ); +$node->stop('fast'); +$log_contents = slurp_file($log); + +# None of the above connections to verifydb should have resulted in +# authentication. +unlike( + $log_contents, + qr/connection authenticated:/, + "trust auth method does not set authenticated identity"); + +$node->start; + # intermediate client_ca.crt is provided by client, and isn't in server's ssl_ca_file switch_server_cert($node, 'server-cn-only', 'root_ca'); $common_connstr = diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl index 410b9e910d..d222e086ec 100644 --- a/src/test/ssl/t/002_scram.pl +++ b/src/test/ssl/t/002_scram.pl @@ -27,7 +27,7 @@ my $SERVERHOSTCIDR = '127.0.0.1/32'; my $supports_tls_server_end_point = check_pg_config("#define HAVE_X509_GET_SIGNATURE_NID 1"); -my $number_of_tests = $supports_tls_server_end_point ? 9 : 10; +my $number_of_tests = $supports_tls_server_end_point ? 15 : 16; # Allocation of base connection string shared among multiple tests. my $common_connstr; @@ -48,14 +48,44 @@ $node->start; configure_test_server_for_ssl($node, $SERVERHOSTADDR, $SERVERHOSTCIDR, "scram-sha-256", "pass", "scram-sha-256"); switch_server_cert($node, 'server-cn-only'); -$ENV{PGPASSWORD} = "pass"; $common_connstr = "dbname=trustdb sslmode=require sslcert=invalid sslrootcert=invalid hostaddr=$SERVERHOSTADDR"; +my $log = $node->rotate_logfile(); +$node->restart; + +# Bad password +$ENV{PGPASSWORD} = "badpass"; +test_connect_fails($common_connstr, "user=ssltestuser", + qr/password authentication failed/, + "Basic SCRAM authentication with bad password"); + +$node->stop('fast'); +my $log_contents = slurp_file($log); + +unlike( + $log_contents, + qr/connection authenticated:/, + "SCRAM does not set authenticated identity with bad password"); + +$log = $node->rotate_logfile(); +$node->start; + # Default settings +$ENV{PGPASSWORD} = "pass"; test_connect_ok($common_connstr, "user=ssltestuser", "Basic SCRAM authentication with SSL"); +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="ssltestuser" method=scram-sha-256/, + "Basic SCRAM sets the username as the authenticated identity"); + +$node->start; + # Test channel_binding test_connect_fails( $common_connstr, @@ -102,6 +132,25 @@ test_connect_fails( qr/channel binding required, but server authenticated client without channel binding/, "Cert authentication and channel_binding=require"); +$log = $node->rotate_logfile(); +$node->restart; + +# Certificate verification at the connection level should still work fine. +test_connect_ok( + "sslcert=ssl/client.crt sslkey=$client_tmp_key sslrootcert=invalid hostaddr=$SERVERHOSTADDR", + "dbname=verifydb user=ssltestuser channel_binding=require", + "SCRAM with clientcert=verify-full and channel_binding=require"); + +$node->stop('fast'); +$log_contents = slurp_file($log); + +like( + $log_contents, + qr/connection authenticated: identity="ssltestuser" method=scram-sha-256/, + "SCRAM with clientcert=verify-full sets the username as the authenticated identity"); + +$node->start; + # clean up unlink($client_tmp_key); diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index ee4925d6d9..db6b6c46e2 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -6695,7 +6695,7 @@ local0.* /var/log/postgresql <listitem> <para> Causes each attempted connection to the server to be logged, - as well as successful completion of client authentication. + as well as successful completion of client authentication and authorization. Only superusers can change this parameter at session start, and it cannot be changed at all within a session. The default is <literal>off</literal>. -- 2.31.0
signature.asc
Description: PGP signature