TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-10-15 17:49:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark the flag properly experimental

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby
2022-11-24 17:26:52 +01:00
committed by Kristoffer Dalby
parent 22da5bfc1d
commit c02e105065
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acls.go
View File

@@ -56,7 +56,7 @@ const (
ProtocolFC = 133 // Fibre Channel ProtocolFC = 133 // Fibre Channel
) )
var featureEnableSSH = envknob.RegisterBool("HEADSCALE_FEATURE_SSH") var featureEnableSSH = envknob.RegisterBool("HEADSCALE_EXPERIMENTAL_FEATURE_SSH")
// LoadACLPolicy loads the ACL policy from the specify path, and generates the ACL rules. // LoadACLPolicy loads the ACL policy from the specify path, and generates the ACL rules.
func (h *Headscale) LoadACLPolicy(path string) error { func (h *Headscale) LoadACLPolicy(path string) error {
@@ -135,7 +135,7 @@ func (h *Headscale) UpdateACLRules() error {
} }
h.sshPolicy.Rules = sshRules h.sshPolicy.Rules = sshRules
} else if h.aclPolicy != nil && len(h.aclPolicy.SSHs) > 0 { } else if h.aclPolicy != nil && len(h.aclPolicy.SSHs) > 0 {
log.Info().Msg("SSH ACLs has been defined, but HEADSCALE_FEATURE_SSH is not enabled, this is a unstable feature, check docs before activating") log.Info().Msg("SSH ACLs has been defined, but HEADSCALE_EXPERIMENTAL_FEATURE_SSH is not enabled, this is a unstable feature, check docs before activating")
} }
return nil return nil

10
integration/ssh_test.go
View File

@@ -79,7 +79,7 @@ func TestSSHOneNamespaceAllToAll(t *testing.T) {
}, },
), ),
hsic.WithConfigEnv(map[string]string{ hsic.WithConfigEnv(map[string]string{
"HEADSCALE_FEATURE_SSH": "1", "HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
}), }),
) )
if err != nil { if err != nil {
@@ -156,7 +156,7 @@ func TestSSHMultipleNamespacesAllToAll(t *testing.T) {
}, },
), ),
hsic.WithConfigEnv(map[string]string{ hsic.WithConfigEnv(map[string]string{
"HEADSCALE_FEATURE_SSH": "1", "HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
}), }),
) )
if err != nil { if err != nil {
@@ -232,7 +232,7 @@ func TestSSHNoSSHConfigured(t *testing.T) {
), ),
hsic.WithTestName("sshnoneconfigured"), hsic.WithTestName("sshnoneconfigured"),
hsic.WithConfigEnv(map[string]string{ hsic.WithConfigEnv(map[string]string{
"HEADSCALE_FEATURE_SSH": "1", "HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
}), }),
) )
if err != nil { if err != nil {
@@ -309,7 +309,7 @@ func TestSSHIsBlockedInACL(t *testing.T) {
), ),
hsic.WithTestName("sshisblockedinacl"), hsic.WithTestName("sshisblockedinacl"),
hsic.WithConfigEnv(map[string]string{ hsic.WithConfigEnv(map[string]string{
"HEADSCALE_FEATURE_SSH": "1", "HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
}), }),
) )
if err != nil { if err != nil {
@@ -394,7 +394,7 @@ func TestSSNamespaceOnlyIsolation(t *testing.T) {
), ),
hsic.WithTestName("sshtwonamespaceaclblock"), hsic.WithTestName("sshtwonamespaceaclblock"),
hsic.WithConfigEnv(map[string]string{ hsic.WithConfigEnv(map[string]string{
"HEADSCALE_FEATURE_SSH": "1", "HEADSCALE_EXPERIMENTAL_FEATURE_SSH": "1",
}), }),
) )
if err != nil { if err != nil {