NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitad6c528

committed

Add error context callback when tokenizing authentication files

The parsing of the authentication files for HBA and ident entrieshappens in two phases:- Tokenization of the files, creating a list of TokenizedAuthLines.- Validation of the HBA and ident entries, building a set of HbaLines orIdentLines.The second phase doing the validation provides already some errorcontext about the configuration file and the line where a problemhappens, but there is no such information in the first phase whentokenizing the files. This commit adds an ErrorContextCallback intokenize_auth_file(), with a context made of the line number and theconfiguration file name involved in a problem. This is useful for filesincluded in an HBA file for user and database lists, and it will becomemuch more handy to track problems for files included via a potential@include[_dir,_if_exists].The error context is registered so as the full chain of events isreported when using cascaded inclusions when for exampletokenize_auth_file() recurses over itself on new files, displaying onecontext line for each file gone through when tokenizing things.Author: Michael PaquierReviewed-by: Julien RouhaudDiscussion:https://postgr.es/m/Y2xUBJ+S+Z0zbxRW@paquier.xyz

1 parent783e8c6 commitad6c528Copy full SHA for ad6c528

File tree

2 files changed

+32

-0

lines changed

src
- backend/libpq
  - hba.c
- tools/pgindent
  - typedefs.list

2 files changed

+32

-0

lines changed

`‎src/backend/libpq/hba.c`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,11 @@ typedef struct check_network_data`
`66`	`66`	`boolresult;/* set to true if match */`
`67`	`67`	`}check_network_data;`
`68`	`68`
	`69`	`+typedefstruct`
	`70`	`+{`
	`71`	`+constchar*filename;`
	`72`	`+intlinenum;`
	`73`	`+}tokenize_error_callback_arg;`
`69`	`74`
`70`	`75`	`#definetoken_has_regexp(t)(t->regex != NULL)`
`71`	`76`	`#definetoken_is_keyword(t,k)(!t->quoted && strcmp(t->string, k) == 0)`
`@@ -125,6 +130,7 @@ static intregcomp_auth_token(AuthToken token, char filename, int line_num,`
`125`	`130`	`char**err_msg,intelevel);`
`126`	`131`	`staticintregexec_auth_token(constcharmatch,AuthTokentoken,`
`127`	`132`	`size_tnmatch,regmatch_tpmatch[]);`
	`133`	`+staticvoidtokenize_error_callback(void*arg);`
`128`	`134`
`129`	`135`
`130`	`136`	`/*`
`@@ -570,6 +576,18 @@ open_auth_file(const char *filename, int elevel, int depth,`
`570`	`576`	`returnfile;`
`571`	`577`	`}`
`572`	`578`
	`579`	`+/*`
	`580`	`+ * error context callback for tokenize_auth_file()`
	`581`	`+ */`
	`582`	`+staticvoid`
	`583`	`+tokenize_error_callback(void*arg)`
	`584`	`+{`
	`585`	`+tokenize_error_callback_argcallback_arg= (tokenize_error_callback_arg)arg;`
	`586`	`+`
	`587`	`+errcontext("line %d of configuration file \"%s\"",`
	`588`	`+callback_arg->linenum,callback_arg->filename);`
	`589`	`+}`
	`590`	`+`
`573`	`591`	`/*`
`574`	`592`	`* tokenize_auth_file`
`575`	`593`	`*Tokenize the given file.`
`@@ -598,6 +616,16 @@ tokenize_auth_file(const char filename, FILE file, List **tok_lines,`
`598`	`616`	`StringInfoDatabuf;`
`599`	`617`	`MemoryContextlinecxt;`
`600`	`618`	`MemoryContextoldcxt;`
	`619`	`+ErrorContextCallbacktokenerrcontext;`
	`620`	`+tokenize_error_callback_argcallback_arg;`
	`621`	`+`
	`622`	`+callback_arg.filename=filename;`
	`623`	`+callback_arg.linenum=line_number;`
	`624`	`+`
	`625`	`+tokenerrcontext.callback=tokenize_error_callback;`
	`626`	`+tokenerrcontext.arg= (void*)&callback_arg;`
	`627`	`+tokenerrcontext.previous=error_context_stack;`
	`628`	`+error_context_stack=&tokenerrcontext;`
`601`	`629`
`602`	`630`	`linecxt=AllocSetContextCreate(CurrentMemoryContext,`
`603`	`631`	`"tokenize_auth_file",`
`@@ -686,10 +714,13 @@ tokenize_auth_file(const char filename, FILE file, List **tok_lines,`
`686`	`714`	`}`
`687`	`715`
`688`	`716`	`line_number+=continuations+1;`
	`717`	`+callback_arg.linenum=line_number;`
`689`	`718`	`}`
`690`	`719`
`691`	`720`	`MemoryContextSwitchTo(oldcxt);`
`692`	`721`
	`722`	`+error_context_stack=tokenerrcontext.previous;`
	`723`	`+`
`693`	`724`	`returnlinecxt;`
`694`	`725`	`}`
`695`	`726`

`‎src/tools/pgindent/typedefs.list`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3723,6 +3723,7 @@ timeout_params`
`3723`	`3723`	`timerCA`
`3724`	`3724`	`tlist_vinfo`
`3725`	`3725`	`toast_compress_header`
	`3726`	`+tokenize_error_callback_arg`
`3726`	`3727`	`transferMode`
`3727`	`3728`	`transfer_thread_arg`
`3728`	`3729`	`trgm`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitad6c528

File tree

2 files changed

2 files changed

`‎src/backend/libpq/hba.c`

`‎src/tools/pgindent/typedefs.list`

0 commit comments