mirror of
https://github.com/juanfont/headscale.git
synced 2026-11-01 03:04:07 +09:00
tests: preserve SSH regressions after combining policy fixes
Updates #3517
This commit is contained in:
1 parent
b7aa328e0c
commit
b8146aa7cd
2 files changed
+6
-5
No files matched your search
@@ -914,7 +914,7 @@ func newSSHVerdictFixture(t *testing.T) *sshVerdictFixture {
|
|||||||
}`, user.Name+"@"))
|
}`, user.Name+"@"))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
period, checkFound := app.state.SSHCheckParams(ids[0], ids[1])
|
period, checkFound := app.state.SSHCheckParams(ids[0], ids[1], sshTestLocalUser)
|
||||||
require.True(t, checkFound, "test setup: pair must be subject to a check")
|
require.True(t, checkFound, "test setup: pair must be subject to a check")
|
||||||
require.Zero(t, period, "test setup: checkPeriod must be always")
|
require.Zero(t, period, "test setup: checkPeriod must be always")
|
||||||
|
|
||||||
@@ -1053,12 +1053,13 @@ func TestSSHActionFollowUp_ConsumedVerdictNotReplayed(t *testing.T) {
|
|||||||
_, err := f.ns.headscale.state.SetPolicy([]byte(`{}`))
|
_, err := f.ns.headscale.state.SetPolicy([]byte(`{}`))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
_, checkFound := f.ns.headscale.state.SSHCheckParams(f.src, f.dst)
|
_, checkFound := f.ns.headscale.state.SSHCheckParams(f.src, f.dst, sshTestLocalUser)
|
||||||
require.False(t, checkFound, "test setup: pair must no longer be subject to a check")
|
require.False(t, checkFound, "test setup: pair must no longer be subject to a check")
|
||||||
|
|
||||||
rec := f.followUp(t, authID)
|
rec := f.followUp(t, authID)
|
||||||
assert.Equal(t, http.StatusBadRequest, rec.Code,
|
action := sshActionFromRecorder(t, rec)
|
||||||
"replay without a check must be refused, body=%s", rec.Body.String())
|
assert.True(t, action.Reject, "replay without a check must be refused")
|
||||||
|
assert.False(t, action.Accept, "replay without a check must never approve access")
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2713,7 +2713,7 @@ func TestUnregisteredUsersAreNoOp(t *testing.T) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
period, ok := pm.SSHCheckParams(n.ID, p.ID)
|
period, ok := pm.SSHCheckParams(n.ID, p.ID, "alice")
|
||||||
got[n.Hostname+"->"+p.Hostname+" via"] = pm.ViaRoutesForPeer(nv, p.View())
|
got[n.Hostname+"->"+p.Hostname+" via"] = pm.ViaRoutesForPeer(nv, p.View())
|
||||||
got[n.Hostname+"->"+p.Hostname+" check"] = checkParams{period, ok}
|
got[n.Hostname+"->"+p.Hostname+" check"] = checkParams{period, ok}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user