@@ -226,12 +226,10 @@ pub(crate) struct GatewayProc {
226226}
227227
228228impl GatewayProc {
229- pub ( crate ) async fn start ( kerberos : bool ) -> anyhow:: Result < Self > {
229+ pub ( crate ) async fn start ( ) -> anyhow:: Result < Self > {
230230 let config = DgwConfig :: builder ( )
231231 . disable_token_validation ( true )
232232 . verbosity_profile ( VerbosityProfile :: DEBUG )
233- . enable_unstable ( kerberos)
234- . kerberos_credential_injection ( kerberos)
235233 . build ( )
236234 . init ( )
237235 . context ( "init gateway config" ) ?;
@@ -430,7 +428,7 @@ async fn connect_rdp_client(gateway_tcp: u16, association_jwt: &str) -> anyhow::
430428#[ tokio:: test]
431429async fn first_rdp_connection_injects_ntlm ( ) -> anyhow:: Result < ( ) > {
432430 let target = FakeRdpTarget :: start ( ) . await ?;
433- let mut gateway = GatewayProc :: start ( false ) . await ?;
431+ let mut gateway = GatewayProc :: start ( ) . await ?;
434432
435433 let jti = next_id ( ) ;
436434 let jet_aid = next_id ( ) ;
@@ -462,7 +460,7 @@ async fn first_rdp_connection_injects_ntlm() -> anyhow::Result<()> {
462460#[ tokio:: test]
463461async fn reconnect_same_jwt_still_injects ( ) -> anyhow:: Result < ( ) > {
464462 let target = FakeRdpTarget :: start ( ) . await ?;
465- let mut gateway = GatewayProc :: start ( false ) . await ?;
463+ let mut gateway = GatewayProc :: start ( ) . await ?;
466464
467465 let jti = next_id ( ) ;
468466 let jet_aid = next_id ( ) ;
@@ -500,7 +498,7 @@ async fn reconnect_same_jwt_still_injects() -> anyhow::Result<()> {
500498#[ tokio:: test]
501499async fn required_missing_fails_closed ( ) -> anyhow:: Result < ( ) > {
502500 let target = FakeRdpTarget :: start ( ) . await ?;
503- let mut gateway = GatewayProc :: start ( false ) . await ?;
501+ let mut gateway = GatewayProc :: start ( ) . await ?;
504502
505503 let jti = next_id ( ) ;
506504 let jet_aid = next_id ( ) ;
@@ -533,7 +531,7 @@ async fn required_missing_fails_closed() -> anyhow::Result<()> {
533531#[ tokio:: test]
534532async fn unprovisioned_rdp_uses_ordinary_forward ( ) -> anyhow:: Result < ( ) > {
535533 let target = FakeRdpTarget :: start ( ) . await ?;
536- let mut gateway = GatewayProc :: start ( false ) . await ?;
534+ let mut gateway = GatewayProc :: start ( ) . await ?;
537535
538536 let jti = next_id ( ) ;
539537 let jet_aid = next_id ( ) ;
@@ -560,7 +558,7 @@ async fn unprovisioned_rdp_uses_ordinary_forward() -> anyhow::Result<()> {
560558#[ tokio:: test]
561559async fn kerberos_reconnect_reuses_generation_until_reprovision ( ) -> anyhow:: Result < ( ) > {
562560 let target = FakeRdpTarget :: start ( ) . await ?;
563- let mut gateway = GatewayProc :: start ( true ) . await ?;
561+ let mut gateway = GatewayProc :: start ( ) . await ?;
564562
565563 let jti = next_id ( ) ;
566564 let jet_aid = next_id ( ) ;
@@ -647,7 +645,7 @@ async fn kerberos_reconnect_reuses_generation_until_reprovision() -> anyhow::Res
647645#[ tokio:: test]
648646async fn domainless_target_stays_ntlm_even_with_krb_kdc ( ) -> anyhow:: Result < ( ) > {
649647 let target = FakeRdpTarget :: start ( ) . await ?;
650- let mut gateway = GatewayProc :: start ( true ) . await ?;
648+ let mut gateway = GatewayProc :: start ( ) . await ?;
651649
652650 let jti = next_id ( ) ;
653651 let jet_aid = next_id ( ) ;
@@ -673,9 +671,9 @@ async fn domainless_target_stays_ntlm_even_with_krb_kdc() -> anyhow::Result<()>
673671}
674672
675673#[ tokio:: test]
676- async fn kerberos_opt_out_uses_ntlm_for_domain_user ( ) -> anyhow:: Result < ( ) > {
674+ async fn kerberos_injection_does_not_need_debug_flags ( ) -> anyhow:: Result < ( ) > {
677675 let target = FakeRdpTarget :: start ( ) . await ?;
678- let mut gateway = GatewayProc :: start ( false ) . await ?;
676+ let mut gateway = GatewayProc :: start ( ) . await ?;
679677
680678 let jti = next_id ( ) ;
681679 let jet_aid = next_id ( ) ;
@@ -692,8 +690,8 @@ async fn kerberos_opt_out_uses_ntlm_for_domain_user() -> anyhow::Result<()> {
692690 let _client = connect_rdp_client ( gateway. config . tcp_port ( ) , & token) . await ?;
693691 let logs = gateway. logs . wait_contains ( INJECT_LOG ) . await ?;
694692 assert ! (
695- logs. contains( "kerberos=false " ) ,
696- "Kerberos injection opt-out must NTLM even with a domain username ; logs:\n {logs}"
693+ logs. contains( "kerberos=true " ) ,
694+ "Kerberos injection must run without debug flags ; logs:\n {logs}"
697695 ) ;
698696
699697 let _ = gateway. process . start_kill ( ) ;
0 commit comments