Commitbd05ad8

committed

Give nicer error message when connecting to a v10 server requiring SCRAM.

This is just to give the user a hint that they need to upgrade, if they tryto connect to a v10 server that uses SCRAM authentication, with an olderclient.Commit to all stable branches, but not master.Discussion:https://www.postgresql.org/message-id/bbf45d92-3896-eeb7-7399-2111d517261b@pivotal.io

1 parent071d133 commitbd05ad8Copy full SHA for bd05ad8

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,8 @@ extern bool Db_user_namespace;`
`172`	`172`	`#defineAUTH_REQ_GSS7/* GSSAPI without wrap() */`
`173`	`173`	`#defineAUTH_REQ_GSS_CONT8/* Continue GSS exchanges */`
`174`	`174`	`#defineAUTH_REQ_SSPI9/* SSPI negotiate without wrap() */`
	`175`	`+#defineAUTH_REQ_SASL 10/* SASL authentication. Not supported before`
	`176`	`+ * libpq version 10. */`
`175`	`177`
`176`	`178`	`typedefuint32AuthRequest;`
`177`	`179`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -703,6 +703,19 @@ pg_fe_sendauth(AuthRequest areq, PGconn *conn)`
`703`	`703`	`returnSTATUS_ERROR;`
`704`	`704`	`break;`
`705`	`705`
	`706`	`+/*`
	`707`	`+ * SASL authentication was introduced in version 10. Older`
	`708`	`+ * versions recognize the request only to give a nicer error`
	`709`	`+ * message. We call it "SCRAM authentication" in the error, rather`
	`710`	`+ * than SASL, because SCRAM is more familiar to users, and it's`
	`711`	`+ * the only SASL authentication mechanism that has been`
	`712`	`+ * implemented as of this writing, anyway.`
	`713`	`+ */`
	`714`	`+caseAUTH_REQ_SASL:`
	`715`	`+printfPQExpBuffer(&conn->errorMessage,`
	`716`	`+libpq_gettext("SCRAM authentication requires libpq version 10 or above\n"));`
	`717`	`+returnSTATUS_ERROR;`
	`718`	`+`
`706`	`719`	`default:`
`707`	`720`	`printfPQExpBuffer(&conn->errorMessage,`
`708`	`721`	`libpq_gettext("authentication method %u not supported\n"),areq);`

Comments

(0)