Skip to content
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.

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

fix(registry): mark torsf as disabled by default #1359

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions internal/experiment/echcheck/handshake.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func handshakeWithEch(ctx context.Context, conn net.Conn, zeroTime time.Time,
return handshakeWithExtension(ctx, conn, zeroTime, address, sni, []utls.TLSExtension{&utlsEchExtension}, logger)
}

func handshakeMaybePrintECH(doprint bool) string {
func handshakeMaybePrintWithECH(doprint bool) string {
if doprint {
return "WithECH"
}
Expand All @@ -51,7 +51,7 @@ func handshakeWithExtension(ctx context.Context, conn net.Conn, zeroTime time.Ti
handshakerConstructor := newHandshakerWithExtensions(extensions)
tracedHandshaker := handshakerConstructor(log.Log, &utls.HelloFirefox_Auto)

ol := logx.NewOperationLogger(logger, "echcheck: TLSHandshake%s", handshakeMaybePrintECH(len(extensions) > 0))
ol := logx.NewOperationLogger(logger, "echcheck: TLSHandshake%s", handshakeMaybePrintWithECH(len(extensions) > 0))
start := time.Now()
maybeTLSConn, err := tracedHandshaker.Handshake(ctx, conn, tlsConfig)
finish := time.Now()
Expand Down
7 changes: 5 additions & 2 deletions internal/registry/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,11 @@ func TestNewFactory(t *testing.T) {
inputPolicy: model.InputNone,
},
"torsf": {
enabledByDefault: true,
inputPolicy: model.InputNone,
// We suspect there will be changes in torsf SNI soon. We are not prepared to
// serve these changes using the check-in API. Hence, disable torsf by default
// and require enabling it using the check-in API feature flags.
//enabledByDefault: false,
inputPolicy: model.InputNone,
},
"urlgetter": {
enabledByDefault: true,
Expand Down
2 changes: 1 addition & 1 deletion internal/registry/torsf.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func init() {
)
},
config: &torsf.Config{},
enabledByDefault: true,
enabledByDefault: false,
inputPolicy: model.InputNone,
}
}