This commit is contained in:
@@ -123,15 +123,21 @@ WHERE target_identity=$1 AND protocol_version=1 FOR UPDATE`, targetIdentity).Sca
|
||||
if revoked != nil {
|
||||
return fmt.Errorf("%w(目标 %s 的激活已于 %s 撤销)", ErrRestoreDispatchNotActivated, targetIdentity, revoked.UTC().Format(time.RFC3339))
|
||||
}
|
||||
if rowFingerprint != targetFingerprint {
|
||||
return fmt.Errorf("%w(目标 %s 的激活绑定指纹 %s,本次恢复目标指纹 %s)",
|
||||
ErrRestoreDispatchNotActivated, targetIdentity, rowFingerprint, targetFingerprint)
|
||||
}
|
||||
var record restoreDispatchActivationRecord
|
||||
if err := json.Unmarshal([]byte(evidenceRaw), &record); err != nil {
|
||||
return fmt.Errorf("parse restore dispatch activation record: %w", err)
|
||||
}
|
||||
verified := record.Verified
|
||||
// 激活行的 target_fingerprint 列是**维护窗口**指纹;binding 带的是本次恢复对
|
||||
// 目标做的只读观察值。两层不能相互顶替,否则正常恢复会被窗口指纹误拒。
|
||||
if rowFingerprint != verified.TargetFingerprint {
|
||||
return fmt.Errorf("%w(目标 %s 的激活行指纹 %s 与登记证据 %s 不一致)",
|
||||
ErrRestoreDispatchNotActivated, targetIdentity, rowFingerprint, verified.TargetFingerprint)
|
||||
}
|
||||
if verified.RestoreTargetFingerprint != targetFingerprint {
|
||||
return fmt.Errorf("%w(目标 %s 的激活登记恢复目标指纹 %s,本次恢复目标指纹 %s)",
|
||||
ErrRestoreDispatchNotActivated, targetIdentity, verified.RestoreTargetFingerprint, targetFingerprint)
|
||||
}
|
||||
authority, primary, _, err := observedGovernanceAuthority(ctx, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user