Skip to content

Accept longer backend secret keys #30

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
mzabani merged 2 commits into from
Jul 2, 2026
Merged

Accept longer backend secret keys #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04bcd03
Accept longer backend secret keys
mzabani Jul 2, 2026
a4537d2
I forgot to change the length in ToMessage
mzabani Jul 2, 2026
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
4 changes: 2 additions & 2 deletions hpgsql/src/Hpgsql/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ internalConnectOrCancel connectOrCancel connOpts originalConnStr@ConnectionStrin
preparedStatementNames = mempty,
transactionStatusBeforeCurrentPipeline = TransIdle
}
let hpgConnPartialDoNotReturn = HPgConnection sock socketIsClosed recvBuffer sendBuffer socketMutex originalConnStr addrInfo encodingContext connParams currentConnectionState 0 0 connOpts
let hpgConnPartialDoNotReturn = HPgConnection sock socketIsClosed recvBuffer sendBuffer socketMutex originalConnStr addrInfo encodingContext connParams currentConnectionState 0 "" connOpts
case connectOrCancel of
CancelNotConnect cancelRequest _ -> do
nonAtomicSendMsg hpgConnPartialDoNotReturn cancelRequest
Expand Down Expand Up @@ -650,7 +650,7 @@ sendCancellationRequest conn = do
() -- Already cancelled, no need to send another
Nothing ->
internalConnectOrCancel
(CancelNotConnect (CancelRequest (connPid conn) (cancelSecretKey conn)) (connectedTo conn))
(CancelNotConnect (CancelRequest conn.connPid conn.cancelSecretKey) conn.connectedTo)
(connOpts conn)
(originalConnStr conn)
(secondsToDiffTime 30)
Expand Down
2 changes: 1 addition & 1 deletion hpgsql/src/Hpgsql/InternalTypes.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ data HPgConnection = HPgConnection
parameterStatusMap :: !(MVar (Map Text Text)),
internalConnectionState :: !(TVar InternalConnectionState),
connPid :: !Int32,
cancelSecretKey :: !Int32,
cancelSecretKey :: !ByteString,
connOpts :: !ConnectOpts
}

Expand Down
12 changes: 6 additions & 6 deletions hpgsql/src/Hpgsql/Msgs.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ data PasswordMessage
PasswordMessage AuthenticationMethod String String
deriving stock (Show)

data BackendKeyData = BackendKeyData {backendPid :: Int32, backendSecretKey :: Int32}
data BackendKeyData = BackendKeyData {backendPid :: !Int32, backendSecretKey :: !BS.ByteString}
deriving stock (Show)

data Bind = Bind {paramsValuesInOrder :: ![BinaryField], resultColumnFmts :: !Int, preparedStmtHash :: !(Maybe String)}
deriving stock (Show)

-- | PId first, secret key second
data CancelRequest = CancelRequest Int32 Int32
data CancelRequest = CancelRequest Int32 ByteString
deriving stock (Show)

newtype CopyData = CopyData Builder
Expand Down Expand Up @@ -160,9 +160,9 @@ instance FromPgMessage AuthenticationResponse where
_ -> Nothing

instance FromPgMessage BackendKeyData where
msgParser = PgMsgParser $ \c (LBS.splitAt 4 -> (pidBS, secretBS)) -> case c of
'K' -> case (,) <$> Cereal.decodeLazy @Int32 pidBS <*> Cereal.decodeLazy @Int32 secretBS of
Right (pid, secret) -> Just $ BackendKeyData {backendPid = pid, backendSecretKey = secret}
msgParser = PgMsgParser $ \c (LBS.splitAt 4 -> (pidBS, backendSecretKey)) -> case c of
'K' -> case Cereal.decodeLazy @Int32 pidBS of
Right pid -> Just $ BackendKeyData {backendPid = pid, backendSecretKey = LBS.toStrict backendSecretKey}
Left _ -> Nothing
_ -> Nothing

Expand Down Expand Up @@ -191,7 +191,7 @@ instance FromPgMessage CommandComplete where

instance ToPgMessage CancelRequest where
toPgMessage (CancelRequest pid secret) =
Builder.int32BE (4 + 4 + 4 + 4) <> Builder.int32BE 80877102 <> Builder.int32BE pid <> Builder.int32BE secret
Builder.int32BE (fromIntegral $ 4 + 4 + 4 + BS.length secret) <> Builder.int32BE 80877102 <> Builder.int32BE pid <> Builder.byteString secret

instance ToPgMessage CopyData where
toPgMessage (CopyData bs) =
Expand Down