balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #493 from sosedoff/auth-error-regex-improvement

Browse Source 
Use regular expression for checking some of the connection errors
This commit is contained in:
Dan Sosedoff 2020-10-18 09:53:55 -05:00 committed by GitHub
commit ce6a777770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cli/cli.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
"regexp"
"strings" "strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -28,6 +29,9 @@ SECURITY WARNING: You are running pgweb in read-only mode.
This mode is designed for environments where users could potentially delete / change data. This mode is designed for environments where users could potentially delete / change data.
For proper read-only access please follow postgresql role management documentation. For proper read-only access please follow postgresql role management documentation.
------------------------------------------------------` ------------------------------------------------------`
regexErrConnectionRefused = regexp.MustCompile(`(connection|actively) refused`)
regexErrAuthFailed = regexp.MustCompile(`authentication failed`)
) )
func exitWithMessage(message string) { func exitWithMessage(message string) {
@ -95,13 +99,13 @@ func initClient() {
} }
// Do not bail if local server is not running. // Do not bail if local server is not running.
if strings.Contains(msg, "connection refused") { if regexErrConnectionRefused.MatchString(msg) {
fmt.Println("Error:", msg) fmt.Println("Error:", msg)
return return
} }
// Do not bail if local auth is invalid // Do not bail if local auth is invalid
if strings.Contains(msg, "authentication failed") { if regexErrAuthFailed.MatchString(msg) {
fmt.Println("Error:", msg) fmt.Println("Error:", msg)
return return
} }