Re: Allow file inclusion in pg_hba and pg_ident files
Julien Rouhaud <rjuju123@gmail.com>
Hi, On Tue, Mar 01, 2022 at 04:45:48PM +0900, Michael Paquier wrote: > > Hmm. The diffs of 0001 are really hard to read. Do you know why this > is happening? Is that because some code has been moved around? Yes, I followed the file convention to put the static functions first and then the exposed functions, and git-diff makes a terrible mess out of it :( > I > have been doing a comparison of all the routines showing up in the > diffs, to note that the contents of load_hba(), load_ident(), > hba_getauthmethod() & friends are actually the same, but this makes > the change history harder to follow. Moving around fill_hba_line() > and fill_hba_view() should be enough, indeed. There's no functional change apart from exposing some functions and moving some in another file, so I though it's still ok to keep some consistency. There isn't much changes backpatched in that file, so it shouldn't create more maintenance burden than simply splitting the file. If you prefer to interleave static and non static function I can change it. > +#include "utils/guc.h" > +//#include "utils/tuplestore.h" Yes I noticed this one this morning. I didn't want to send a new patch version just for that, but I already fixed it locally. > + /* Build a tuple descriptor for our result type */ > + if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) > + elog(ERROR, "return type must be a row type"); > > Worth noting that I was planning to apply a patch from Melanie > Plageman to simplify the creation of tupledesc and tuplestores for > set-returning functions like this one, so this would cut a bit of code > here. This is not directly related to your patch, though, that's my > business :) Yes I'm aware of that thread. I will be happy to change the patch to use MakeFuncResultTuplestore() as soon as it lands. Thanks for the notice though. > Well, as of 0002, one thing that makes things harder to follow is that > parse_ident_line() is moved at a different place in hba.c, one slight > difference being err_msg to store the error message in the token > line.. But shouldn't the extension of parse_ident_line() with its > elevel be included in 0001? No, because 0001 is unrelated. The changes you mentioned (exposing the function and adding the error reporting) are only needed for the new view introduced in 0002, thus not part of 0001. > Or, well, it could just be done in its own patch to make for a cleaner > history, so as 0002 could be shaped as two commits itself. It seems strange to me to add a commit (or include in a commit) just to make a single function exposed while nothing needs it, but I can do it this way if you prefer. > Also, it seems to me that we'd better have some TAP tests for that to > make sure of its contents? As I mentioned in my initial email, I intentionally didn't add any test in the patchset yet, except the exact same coverage for the new view as there's for pg_hba_file_rules. Ideally I'd like to add tests only once, to cover both 002 and 0003. But I don't want to waste time for that right now, especially since no one seems to be interested in 0003. > +-- We expect no user mapping in this test > +select count(*) = 0 as ok from pg_ident_file_mappings; > > It could be possible to do installcheck on an instance that has user > mappings meaning that this had better be ">= 0", no? I thought about it, and supposed it would bring a bit more value with the test like that. I can change it if you prefer. > Does this pass > on Windows where pg_regress sets some mappings for SSPI when creating > one or more roles? According to CI and cfbot yes. E.g. https://cirrus-ci.com/github/postgresql-cfbot/postgresql/commitfest/37/3558. Note that the failed runs are the warning I mentioned for mingw32 and the POC 0004, which is now fixed.
Commits
-
Add TAP tests for include directives in HBA end ident files
- cbe6e482d7bf 16.0 landed
-
Introduce variables for initial and max nesting depth on configuration files
- d13b684117bd 16.0 landed
-
Add support for file inclusions in HBA and ident configuration files
- a54b658ce77b 16.0 landed
-
Add missing initialization in tokenize_expand_file() for output list
- d5566fbfeb6a 16.0 landed
-
Rework memory contexts in charge of HBA/ident tokenization
- efc981627a72 16.0 landed
-
Add error context callback when tokenizing authentication files
- ad6c52846f13 16.0 landed
-
Invent open_auth_file() in hba.c to refactor authentication file opening
- 783e8c69cbcd 16.0 landed
-
Use AbsoluteConfigLocation() when building an included path in hba.c
- 6bbd8b73857a 16.0 landed
-
Move code related to configuration files in directories to new file
- a1a7bb8f16cd 16.0 landed
-
doc: Fix some descriptions related to pg_ident_file_mappings
- 468a9f37fb69 15.1 landed
- e76502871ee3 16.0 landed
-
Add rule_number to pg_hba_file_rules and map_number to pg_ident_file_mappings
- c591300a8f54 16.0 landed
-
Refactor code handling the names of files loaded in hba.c
- 1b73d0b1c393 16.0 landed
-
Make consistent a couple of log messages when parsing HBA files
- 718fe0a14add 16.0 landed
-
Use hba_file/ident_file GUCs rather than pg_hba.conf/pg_ident.conf in logs
- 47ab1ac822cd 16.0 landed
-
Fix path reference when parsing pg_ident.conf for pg_ident_file_mappings
- 7977ac1640a7 15.0 landed
- 27e0ee57f68d 16.0 landed
-
Add system view pg_ident_file_mappings
- a2c84990bea7 15.0 landed
-
Modify query on pg_hba_file_rules to check for errors in regression tests
- 091a971bb59c 15.0 landed
-
Refactor code related to pg_hba_file_rules() into new file
- d4781d8873f8 15.0 landed