Skip to content

We are not using password hash, so let's not pull it #10

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

Merged
merged 1 commit into from
Jan 4, 2022
Merged

We are not using password hash, so let's not pull it #10

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
21 changes: 4 additions & 17 deletions pkg/flypg/admin/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package admin

import (
"context"
"crypto/md5"
"fmt"
"strings"

"github.com/jackc/pgx/v4"
)
Expand Down Expand Up @@ -72,19 +70,9 @@ func ListDatabases(ctx context.Context, pg *pgx.Conn) ([]DbInfo, error) {
}

type UserInfo struct {
Username string `json:"username"`
SuperUser bool `json:"superuser"`
Databases []string `json:"databases"`
PasswordHash string `json:"-"`
}

func (ui UserInfo) IsPassword(password string) bool {
if !strings.HasPrefix(ui.PasswordHash, "md5") {
return false
}

encoded := fmt.Sprintf("md5%x", md5.Sum([]byte(password+ui.Username)))
return encoded == ui.PasswordHash
Username string `json:"username"`
SuperUser bool `json:"superuser"`
Databases []string `json:"databases"`
}

type DbInfo struct {
Expand All @@ -96,7 +84,6 @@ func ListUsers(ctx context.Context, pg *pgx.Conn) ([]UserInfo, error) {
sql := `
select u.usename,
usesuper as superuser,
a.rolpassword as passwordhash,
(select array_agg(d.datname::text order by d.datname)
from pg_database d
WHERE datistemplate = false
Expand All @@ -117,7 +104,7 @@ func ListUsers(ctx context.Context, pg *pgx.Conn) ([]UserInfo, error) {

for rows.Next() {
ui := UserInfo{}
if err := rows.Scan(&ui.Username, &ui.SuperUser, &ui.PasswordHash, &ui.Databases); err != nil {
if err := rows.Scan(&ui.Username, &ui.SuperUser, &ui.Databases); err != nil {
return nil, err
}
values = append(values, ui)
Expand Down