Content-Type: multipart/mixed; boundary="------------KbkufrV013iZzRKin5SBbFJy"
Message-ID: <05056cfa-50d9-502d-4c4c-4725c6fb9943@gmail.com>
Date: Fri, 30 Sep 2022 19:51:29 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.3.0
Subject: Re: [PATCH] Add peer authentication TAP test
Content-Language: en-US
To: Michael Paquier <michael@paquier.xyz>
Cc: PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
References: <aa60994b-1c66-ca7a-dab9-9a200dbac3d2@amazon.com>
 <YzPhGhI0dyC4/IAG@paquier.xyz>
 <2ecffb46-8b0c-83cb-2577-bf83262b5f10@gmail.com>
 <YzP2vBC1uBGEDRM6@paquier.xyz> <YzYxtuTzpoz6x2tD@paquier.xyz>
From: "Drouvot, Bertrand" <bertranddrouvot.pg@gmail.com>
In-Reply-To: <YzYxtuTzpoz6x2tD@paquier.xyz>
Archived-At: 
 <https://www.postgresql.org/message-id/05056cfa-50d9-502d-4c4c-4725c6fb9943%40gmail.com>
Precedence: bulk

This is a multi-part message in MIME format.
--------------KbkufrV013iZzRKin5SBbFJy
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

On 9/30/22 2:00 AM, Michael Paquier wrote:
> On Wed, Sep 28, 2022 at 04:24:44PM +0900, Michael Paquier wrote:
>> Hmm, indeed.  It would be more reliable to rely on the contents
>> returned by getpeereid()/getpwuid() after one successful peer
>> connection, then use it in the map.  I was wondering whether using
>> stuff like getpwuid() in the perl script itself would be better, but
>> it sounds less of a headache in terms of portability to just rely on
>> authn_id via SYSTEM_USER to generate the contents of the correct map.
> 
> By the way, on an extra read I have found a few things that can be
> simplified
> - I think that test_role() should be reworked so as the log patterns
> expected are passed down to connect_ok() and connect_fails() rather
> than involving find_in_log().  You still need find_in_log() to skip
> properly the case where peer is not supported by the platform, of
> course.
> - get_log_size() is not necessary.  You should be able to get the same
> information with "-s $self->logfile".
> - Nit: a newline should be added at the end of 003_peer.pl.
> --

Agree that it could be simplified, thanks for the hints!

Attached a simplified version.

Regards,

-- 
Bertrand Drouvot
PostgreSQL Contributors Team
RDS Open Source Databases
Amazon Web Services: https://aws.amazon.com
--------------KbkufrV013iZzRKin5SBbFJy
Content-Type: text/plain; charset=UTF-8;
 name="v2-0001-peer-authentication-tap-test.patch"
Content-Disposition: attachment;
 filename="v2-0001-peer-authentication-tap-test.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtLWdpdCBhL3NyYy90ZXN0L2F1dGhlbnRpY2F0aW9uL3QvMDAzX3BlZXIucGwgYi9z
cmMvdGVzdC9hdXRoZW50aWNhdGlvbi90LzAwM19wZWVyLnBsCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAuLjU3YmYyMzQzZmMKLS0tIC9kZXYvbnVsbAorKysgYi9z
cmMvdGVzdC9hdXRoZW50aWNhdGlvbi90LzAwM19wZWVyLnBsCkBAIC0wLDAgKzEsMTA4IEBA
CisKKyMgQ29weXJpZ2h0IChjKSAyMDIyLCBQb3N0Z3JlU1FMIEdsb2JhbCBEZXZlbG9wbWVu
dCBHcm91cAorCisjIFRlc3RzIGZvciBwZWVyIGF1dGhlbnRpY2F0aW9uIGFuZCB1c2VyIG5h
bWUgbWFwLgorIyBUaGUgdGVzdCBpcyBza2lwcGVkIGlmIHRoZSBwbGF0Zm9ybSBkb2VzIG5v
dCBzdXBwb3J0IHBlZXIgYXV0aGVudGljYXRpb24uCisKK3VzZSBzdHJpY3Q7Cit1c2Ugd2Fy
bmluZ3M7Cit1c2UgUG9zdGdyZVNRTDo6VGVzdDo6Q2x1c3RlcjsKK3VzZSBQb3N0Z3JlU1FM
OjpUZXN0OjpVdGlsczsKK3VzZSBUZXN0OjpNb3JlOworCisjIERlbGV0ZSBwZ19oYmEuY29u
ZiBmcm9tIHRoZSBnaXZlbiBub2RlLCBhZGQgYSBuZXcgZW50cnkgdG8gaXQKKyMgYW5kIHRo
ZW4gZXhlY3V0ZSBhIHJlbG9hZCB0byByZWZyZXNoIGl0Lgorc3ViIHJlc2V0X3BnX2hiYQor
eworCW15ICRub2RlICAgICAgID0gc2hpZnQ7CisJbXkgJGhiYV9tZXRob2QgPSBzaGlmdDsK
KworCXVubGluaygkbm9kZS0+ZGF0YV9kaXIgLiAnL3BnX2hiYS5jb25mJyk7CisJIyBqdXN0
IGZvciB0ZXN0aW5nIHB1cnBvc2VzLCB1c2UgYSBjb250aW51YXRpb24gbGluZS4KKwkkbm9k
ZS0+YXBwZW5kX2NvbmYoJ3BnX2hiYS5jb25mJywgImxvY2FsIGFsbCBhbGxcXFxuICRoYmFf
bWV0aG9kIik7CisJJG5vZGUtPnJlbG9hZDsKKwlyZXR1cm47Cit9CisKKyMgVGVzdCBhY2Nl
c3MgZm9yIGEgc2luZ2xlIHJvbGUsIHVzZWZ1bCB0byB3cmFwIGFsbCB0ZXN0cyBpbnRvIG9u
ZS4KK3N1YiB0ZXN0X3JvbGUKK3sKKyAgbG9jYWwgJFRlc3Q6OkJ1aWxkZXI6OkxldmVsID0g
JFRlc3Q6OkJ1aWxkZXI6OkxldmVsICsgMTsKKworICBteSAoJG5vZGUsICRyb2xlLCAkbWV0
aG9kLCAkZXhwZWN0ZWRfcmVzLCAlcGFyYW1zKSA9IEBfOworICBteSAkc3RhdHVzX3N0cmlu
ZyA9ICdmYWlsZWQnOworICAkc3RhdHVzX3N0cmluZyA9ICdzdWNjZXNzJyBpZiAoJGV4cGVj
dGVkX3JlcyBlcSAwKTsKKworICBteSAkY29ubnN0ciA9ICJ1c2VyPSRyb2xlIjsKKyAgbXkg
JHRlc3RuYW1lID0KKyAgICAiYXV0aGVudGljYXRpb24gJHN0YXR1c19zdHJpbmcgZm9yIG1l
dGhvZCAkbWV0aG9kLCByb2xlICRyb2xlIjsKKworICBpZiAoJGV4cGVjdGVkX3JlcyBlcSAw
KQorICB7CisgICAgJG5vZGUtPmNvbm5lY3Rfb2soJGNvbm5zdHIsICR0ZXN0bmFtZSwgJXBh
cmFtcyk7CisgIH0KKyAgZWxzZQorICB7CisgICAgICAjIE5vIGNoZWNrcyBvZiB0aGUgZXJy
b3IgbWVzc2FnZSwgb25seSB0aGUgc3RhdHVzIGNvZGUuCisgICAgICAkbm9kZS0+Y29ubmVj
dF9mYWlscygkY29ubnN0ciwgJHRlc3RuYW1lLCAlcGFyYW1zKTsKKyAgfQorfQorCisjIGZp
bmQgJHBhdCBpbiBsb2dmaWxlIG9mICRub2RlLgorc3ViIGZpbmRfaW5fbG9nCit7CisgIG15
ICgkbm9kZSwgJHBhdCkgPSBAXzsKKworICBteSAkbG9nID0gUG9zdGdyZVNRTDo6VGVzdDo6
VXRpbHM6OnNsdXJwX2ZpbGUoJG5vZGUtPmxvZ2ZpbGUpOworICByZXR1cm4gMCBpZiAobGVu
Z3RoKCRsb2cpIDw9IDApOworCisgIHJldHVybiAkbG9nID1+IG0vJHBhdC87Cit9CisKKyMg
SW5pdGlhbGl6ZSBwcmltYXJ5IG5vZGUuCitteSAkbm9kZSA9IFBvc3RncmVTUUw6OlRlc3Q6
OkNsdXN0ZXItPm5ldygncHJpbWFyeScpOworJG5vZGUtPmluaXQ7Ciskbm9kZS0+YXBwZW5k
X2NvbmYoJ3Bvc3RncmVzcWwuY29uZicsICJsb2dfY29ubmVjdGlvbnMgPSBvblxuIik7Cisk
bm9kZS0+c3RhcnQ7CisKKyMgU2V0IHBnX2hiYS5jb25mIHdpdGggdGhlIHBlZXIgYXV0aGVu
dGljYXRpb24uCityZXNldF9wZ19oYmEoJG5vZGUsICdwZWVyJyk7CisKKyMgQ2hlY2sgdGhh
dCBwZWVyIGF1dGhlbnRpY2F0aW9uIGlzIHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtLgor
JG5vZGUtPnBzcWwoJ3Bvc3RncmVzJyk7CisKKyMgSWYgbm90IHN1cHBvcnRlZCwgdGhlbiBz
a2lwIHRoZSByZXN0IG9mIHRoZSB0ZXN0LgoraWYgKGZpbmRfaW5fbG9nKCRub2RlLCBxci9w
ZWVyIGF1dGhlbnRpY2F0aW9uIGlzIG5vdCBzdXBwb3J0ZWQgb24gdGhpcyBwbGF0Zm9ybS8p
KQoreworICAgIHBsYW4gc2tpcF9hbGwgPT4gJ3BlZXIgYXV0aGVudGljYXRpb24gaXMgbm90
IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtJzsKK30KKworIyBMZXQncyBjcmVhdGUgYSBu
ZXcgdXNlciBmb3IgdGhlIHVzZXIgbmFtZSBtYXAgdGVzdC4KKyRub2RlLT5zYWZlX3BzcWwo
J3Bvc3RncmVzJywKKyAgcXF7Q1JFQVRFIFVTRVIgdGVzdG1hcHVzZXJ9KTsKKworIyBHZXQg
dGhlIHN5c3RlbV91c2VyIHRvIGRlZmluZSB0aGUgdXNlciBuYW1lIG1hcCB0ZXN0LgorbXkg
JHN5c3RlbV91c2VyID0KKyAgJG5vZGUtPnNhZmVfcHNxbCgncG9zdGdyZXMnLCBxKHNlbGVj
dCAoc3RyaW5nX3RvX2FycmF5KFNZU1RFTV9VU0VSLCAnOicpKVsyXSkpOworCisjIFRoaXMg
Y29ubmVjdGlvbiBzaG91bGQgc3VjY2VlZC4KK3Rlc3Rfcm9sZSgkbm9kZSwgJHN5c3RlbV91
c2VyLCAncGVlcicsIDAsCisgICAgbG9nX2xpa2UgPT4KKyAgICAgIFtxci9jb25uZWN0aW9u
IGF1dGhlbnRpY2F0ZWQ6IGlkZW50aXR5PSIkc3lzdGVtX3VzZXIiIG1ldGhvZD1wZWVyL10p
OworCisjIFRoaXMgY29ubmVjdGlvbiBzaG91bGQgZmFpbGVkLgordGVzdF9yb2xlKCRub2Rl
LCBxcXt0ZXN0bWFwdXNlcn0sICdwZWVyJywgMiwKKyAgICBsb2dfbGlrZSA9PiBbcXIvUGVl
ciBhdXRoZW50aWNhdGlvbiBmYWlsZWQgZm9yIHVzZXIgInRlc3RtYXB1c2VyIi9dKTsKKwor
IyBEZWZpbmUgYSB1c2VyIG5hbWUgbWFwLgorJG5vZGUtPmFwcGVuZF9jb25mKCdwZ19pZGVu
dC5jb25mJywgcXF7bXlwZWVybWFwICRzeXN0ZW1fdXNlciB0ZXN0bWFwdXNlcn0pOworCisj
IFNldCBwZ19oYmEuY29uZiB3aXRoIHRoZSBwZWVyIGF1dGhlbnRpY2F0aW9uIGFuZCB0aGUg
dXNlciBuYW1lIG1hcC4KK3Jlc2V0X3BnX2hiYSgkbm9kZSwgJ3BlZXIgbWFwPW15cGVlcm1h
cCcpOworCisjIFRoaXMgY29ubmVjdGlvbiBzaG91bGQgbm93IHN1Y2NlZWQuCit0ZXN0X3Jv
bGUoJG5vZGUsIHFxe3Rlc3RtYXB1c2VyfSwgJ3BlZXInLCAwLAorICAgIGxvZ19saWtlID0+
CisgICAgICBbcXIvY29ubmVjdGlvbiBhdXRoZW50aWNhdGVkOiBpZGVudGl0eT0iJHN5c3Rl
bV91c2VyIiBtZXRob2Q9cGVlci9dKTsKKworZG9uZV90ZXN0aW5nKCk7Cg==

--------------KbkufrV013iZzRKin5SBbFJy--