mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2026-05-05 02:46:10 +02:00
Code Issues Projects Releases Wiki Activity

Handle parsing errors in pgpass gracefully.

Browse Source 
Accept empty password lines in ~/.pgpass files, and when otherwise pgloader
fails to parse or process the file log a warning and return a nil password.

See #748.
This commit is contained in:
Dimitri Fontaine 2018-02-25 00:08:02 +01:00
parent bd7eb38720
commit 784aff6ed5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/parsers/parse-pgpass.lisp
View File

@ -21,7 +21,7 @@
(defrule pgpass-line (and pgpass-entry #\: pgpass-entry #\:
pgpass-entry #\: pgpass-entry #\:
pgpass-entry)
(? pgpass-entry))
(:lambda (pl)
(make-pgpass :hostname (first pl)
:port (third pl)
@ -87,6 +87,12 @@
(defun match-pgpass-file (hostname port database username)
"Return matched password from ~/.pgpass or PGPASSFILE, or nil."
(let ((pgpass-entries (parse-pgpass-file)))
(when pgpass-entries
(match-pgpass-entries pgpass-entries hostname port database username))))
(handler-case
(let ((pgpass-entries (parse-pgpass-file)))
(when pgpass-entries
(match-pgpass-entries pgpass-entries hostname port database username)))
(condition (e)
;; if we had any problem (parsing error in pgpass or otherwise), just
;; return a NIL password
(log-message :warning "Error reading pgass file: ~a" e)
nil)))