astra/owpengram-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: sync temp auth key expiry boundaries

Browse source
This commit is contained in:
A 2026-07-13 23:04:15 +08:00
parent 305e8a0008
commit 20a310f6ca
50 changed files with 3626 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/mtprotoedge/exchange_compat.go
View file

@ -50,9 +50,9 @@ func (s *Server) runServerExchange(ctx context.Context, conn transport.Conn) (ex
// client is allowed to immediately use the new key, possibly on another TCP
// connection. Persisting after the response creates a split-brain window when
// storage fails or the process exits between those two operations.
func (s *Server) commitExchangeAuthKey(ctx context.Context, result exchange.ServerExchangeResult) error {
func (s *Server) commitExchangeAuthKey(ctx context.Context, result exchange.ServerExchangeResult, expiresAt int) error {
createdAt := s.clock.Now().Unix()
if err := s.authKeys.Save(ctx, authKeyData(result.Key, result.ServerSalt, createdAt)); err != nil {
if err := s.authKeys.Save(ctx, authKeyData(result.Key, result.ServerSalt, createdAt, expiresAt)); err != nil {
return fmt.Errorf("persist auth key before DhGenOk: %w", err)
}
return nil
@ -67,7 +67,7 @@ type serverExchangeCompat struct {
dc int
log *zap.Logger
rng compatServerRNG
commitKey func(context.Context, exchange.ServerExchangeResult) error
commitKey func(context.Context, exchange.ServerExchangeResult, int) error
}
const pqInnerDataTempTypeID uint32 = 0x3c6a84d4
@ -129,7 +129,10 @@ SendResPQ:
s.log.Debug("Received client ReqDHParamsRequest")
}
var innerData mt.PQInnerData
var (
innerData mt.PQInnerData
authKeyExpiresAt int
)
{
if dhParams.DH.Nonce != req.Nonce {
return exchange.ServerExchangeResult{}, gofaster.New("req_DH_params nonce does not match req_pq")
@ -161,6 +164,15 @@ SendResPQ:
}
innerData = d.Data
if d.Temp {
expiresAt := s.clock.Now().Unix() + int64(d.ExpiresIn)
// TL timestamps are signed int32 on the wire. Reject an impossible
// lifetime instead of wrapping a temporary key into a permanent one.
if expiresAt <= 0 || expiresAt > int64(^uint32(0)>>1) {
return exchange.ServerExchangeResult{}, gofaster.New("temporary auth key expiry is out of int32 range")
}
authKeyExpiresAt = int(expiresAt)
}
}
dhPrime, err := s.rng.DhPrime()
@ -251,7 +263,7 @@ SendResPQ:
if s.commitKey == nil {
return exchange.ServerExchangeResult{}, gofaster.New("auth key commit hook is required before DhGenOk")
}
if err := s.commitKey(ctx, serverResult); err != nil {
if err := s.commitKey(ctx, serverResult, authKeyExpiresAt); err != nil {
return exchange.ServerExchangeResult{}, err
}