Skip to content

Test nginz zauth_timestamp #4611

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
merged 5 commits into from
Jun 12, 2025
Merged

Test nginz zauth_timestamp #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3454838
Improve test
supersven Jun 11, 2025
b78b229
Add Z-Timestamp header to integration test nginz config
supersven Jun 11, 2025
de7ad67
Add changelog entry
supersven Jun 11, 2025
1adb3e4
applied formatting
stefanwire Jun 12, 2025
7213e16
apply generate-local-nix-packages.sh
stefanwire Jun 12, 2025
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
1 change: 1 addition & 0 deletions changelog.d/5-internal/test-z-timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Assert the value of nginz's `zauth_timestamp` in test.
2 changes: 2 additions & 0 deletions integration/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
, transformers
, transformers-base
, unix
, unix-time
, unliftio
, uuid
, vector
Expand Down Expand Up @@ -183,6 +184,7 @@ mkDerivation {
transformers
transformers-base
unix
unix-time
unliftio
uuid
vector
Expand Down
1 change: 1 addition & 0 deletions integration/integration.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ library
, transformers
, transformers-base
, unix
, unix-time
, unliftio
, uuid
, vector
Expand Down
5 changes: 5 additions & 0 deletions integration/test/Test/NginxZAuthModule.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Control.Monad.Reader
import qualified Data.ByteString as BS
import Data.List.Extra
import Data.Streaming.Network
import Data.UnixTime
import qualified Network.HTTP.Client as HTTP
import Network.HTTP.Types
import Network.Socket (Socket)
Expand Down Expand Up @@ -49,6 +50,10 @@ testBearerToken = do
resp.status `shouldMatchInt` 200
resp.json %. "user" `shouldMatch` (alice %. "qualified_id.id")
resp.json %. "timestamp" `shouldNotMatch` ""
timestampI <- (resp.json %. "timestamp" >>= asString)
let timestampUnix = UnixTime ((fromInteger . read) timestampI) 0
now <- liftIO $ getUnixTime
assertBool "not in future" (timestampUnix > now)

-- Happy flow (zauth token encoded in AWS4_HMAC_SHA256)
--
Expand Down
1 change: 1 addition & 0 deletions services/nginz/integration-test/conf/nginz/common_response.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
proxy_set_header Z-Provider $zauth_provider;
proxy_set_header Z-Bot $zauth_bot;
proxy_set_header Z-Conversation $zauth_conversation;
proxy_set_header Z-Timestamp $zauth_timestamp;
proxy_set_header Request-Id $request_id;

# NOTE: This should only be used on endpoints where credentials are needed
Expand Down