Skip to content

fix: prevent panic in IsDSN on short input strings #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SAY-5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent panic in IsDSN on short input strings #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/format/pgre/pgre.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"fmt"
"net/url"
"strings"

"github.com/go-pg/pg/v10"
"github.com/vmkteam/pgdesigner/pkg/pgd"
Expand Down Expand Up @@ -50,7 +51,7 @@ func connectDB(dsn string) (*pg.DB, error) {

// IsDSN returns true if the input looks like a PostgreSQL DSN.
func IsDSN(s string) bool {
return len(s) > 11 && (s[:11] == "postgres://" || s[:13] == "postgresql://")
return strings.HasPrefix(s, "postgres://") || strings.HasPrefix(s, "postgresql://")
}

func parseDSN(dsn string) (*pg.Options, error) {
Expand Down
19 changes: 19 additions & 0 deletions pkg/format/pgre/pgre_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,25 @@ func skipIfNoPG(t *testing.T) {
}
}

func TestIsDSN(t *testing.T) {
tests := []struct {
name string
in string
want bool
}{
{name: "postgres scheme", in: "postgres://localhost/db", want: true},
{name: "postgresql scheme", in: "postgresql://localhost/db", want: true},
{name: "plain path", in: "docs/apisrv.xml", want: false},
{name: "trailing dot 12 chars", in: "docs/apisrv.", want: false},
{name: "empty", in: "", want: false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assert.Equal(t, tt.want, IsDSN(tt.in))
})
}
}

func TestParseIndexColumns(t *testing.T) {
tests := []struct {
name string
Expand Down