Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
44ab596b
Commit
44ab596b
authored
22 years ago
by
Bruce Momjian
Browse files
Options
Downloads
Patches
Plain Diff
Allow 'password' encryption even when pg_shadow has MD5 passwords, per
report from Terry Yapt and Hiroshi. Backpatch to 7.3.
parent
1fd0c59e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/backend/libpq/crypt.c
+22
-6
22 additions, 6 deletions
src/backend/libpq/crypt.c
src/include/libpq/crypt.h
+2
-2
2 additions, 2 deletions
src/include/libpq/crypt.h
with
24 additions
and
8 deletions
src/backend/libpq/crypt.c
+
22
−
6
View file @
44ab596b
...
...
@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.
49
2002/
09/04 20:31:19
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/crypt.c,v 1.
50
2002/
12/05 18:39:43
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -29,7 +29,7 @@
int
md5_crypt_verify
(
const
Port
*
port
,
const
char
*
user
,
const
char
*
pgpass
)
md5_crypt_verify
(
const
Port
*
port
,
const
char
*
user
,
char
*
pgpass
)
{
char
*
passwd
=
NULL
,
*
valuntil
=
NULL
,
...
...
@@ -37,6 +37,7 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
int
retval
=
STATUS_ERROR
;
List
**
line
;
List
*
token
;
char
*
crypt_pgpass
=
pgpass
;
if
((
line
=
get_user_line
(
user
))
==
NULL
)
return
STATUS_ERROR
;
...
...
@@ -54,11 +55,11 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
if
(
passwd
==
NULL
||
*
passwd
==
'\0'
)
return
STATUS_ERROR
;
/*
If they encrypt their password, force MD5
*/
if
(
isMD5
(
passwd
)
&&
port
->
auth_method
!
=
ua
MD5
)
/*
We can't do crypt with pg_shadow MD5 passwords
*/
if
(
isMD5
(
passwd
)
&&
port
->
auth_method
=
=
ua
Crypt
)
{
elog
(
LOG
,
"Password is stored MD5 encrypted. "
"
'password' and
'crypt' auth method
s
cannot be used."
);
"'crypt' auth method cannot be used."
);
return
STATUS_ERROR
;
}
...
...
@@ -72,6 +73,7 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
crypt_pwd
=
palloc
(
MD5_PASSWD_LEN
+
1
);
if
(
isMD5
(
passwd
))
{
/* pg_shadow already encrypted, only do salt */
if
(
!
EncryptMD5
(
passwd
+
strlen
(
"md5"
),
(
char
*
)
port
->
md5Salt
,
sizeof
(
port
->
md5Salt
),
crypt_pwd
))
...
...
@@ -82,6 +84,7 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
}
else
{
/* pg_shadow plain, double-encrypt */
char
*
crypt_pwd2
=
palloc
(
MD5_PASSWD_LEN
+
1
);
if
(
!
EncryptMD5
(
passwd
,
port
->
user
,
strlen
(
port
->
user
),
...
...
@@ -110,11 +113,22 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
break
;
}
default:
if
(
isMD5
(
passwd
))
{
/* Encrypt user-supplied password to match MD5 in pg_shadow */
crypt_pgpass
=
palloc
(
MD5_PASSWD_LEN
+
1
);
if
(
!
EncryptMD5
(
pgpass
,
port
->
user
,
strlen
(
port
->
user
),
crypt_pgpass
))
{
pfree
(
crypt_pgpass
);
return
STATUS_ERROR
;
}
}
crypt_pwd
=
passwd
;
break
;
}
if
(
strcmp
(
pgpass
,
crypt_pwd
)
==
0
)
if
(
strcmp
(
crypt_
pgpass
,
crypt_pwd
)
==
0
)
{
/*
* Password OK, now check to be sure we are not past valuntil
...
...
@@ -136,6 +150,8 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
if
(
port
->
auth_method
==
uaMD5
)
pfree
(
crypt_pwd
);
if
(
crypt_pgpass
!=
pgpass
)
pfree
(
crypt_pgpass
);
return
retval
;
}
This diff is collapsed.
Click to expand it.
src/include/libpq/crypt.h
+
2
−
2
View file @
44ab596b
...
...
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: crypt.h,v 1.2
2
2002/
09/04 20
:3
1
:4
2
momjian Exp $
* $Id: crypt.h,v 1.2
3
2002/
12/05 18
:3
9
:4
3
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -23,7 +23,7 @@
extern
int
md5_crypt_verify
(
const
Port
*
port
,
const
char
*
user
,
const
char
*
pgpass
);
char
*
pgpass
);
extern
bool
md5_hash
(
const
void
*
buff
,
size_t
len
,
char
*
hexsum
);
extern
bool
CheckMD5Pwd
(
char
*
passwd
,
char
*
storedpwd
,
char
*
seed
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment