diff --git a/common/ssh/query.go b/common/ssh/query.go new file mode 100644 index 0000000..8e4cf61 --- /dev/null +++ b/common/ssh/query.go @@ -0,0 +1,44 @@ +package ssh + +import ( + "config-lsp/doc-values" + "config-lsp/utils" + "os/exec" + "strings" +) + +var _cachedQueries map[string][]docvalues.EnumString = make(map[string][]docvalues.EnumString) + +func queryValues(query string) ([]string, error) { + cmd := exec.Command("ssh", "-Q", query) + + output, err := cmd.Output() + + if err != nil { + return []string{}, err + } + + return strings.Split(string(output), "\n"), nil +} + +func QueryOpenSSHOptions( + query string, +) ([]docvalues.EnumString, error) { + var availableQueries []docvalues.EnumString + key := query + + if _cachedQueries[key] != nil && len(_cachedQueries[key]) > 0 { + return _cachedQueries[key], nil + } else { + availableRawQueries, err := queryValues(query) + availableQueries = utils.Map(availableRawQueries, docvalues.CreateEnumString) + + if err != nil { + return []docvalues.EnumString{}, err + } + + _cachedQueries[key] = availableQueries + } + + return availableQueries, nil +} diff --git a/handlers/sshd_config/fields/value-data-amount-value.go b/doc-values/value-data-amount-value.go similarity index 90% rename from handlers/sshd_config/fields/value-data-amount-value.go rename to doc-values/value-data-amount-value.go index 01a6b68..0616b54 100644 --- a/handlers/sshd_config/fields/value-data-amount-value.go +++ b/doc-values/value-data-amount-value.go @@ -1,7 +1,6 @@ -package fields +package docvalues import ( - docvalues "config-lsp/doc-values" "fmt" "regexp" "strconv" @@ -23,9 +22,9 @@ func (v DataAmountValue) GetTypeDescription() []string { return []string{"Data amount"} } -func (v DataAmountValue) CheckIsValid(value string) []*docvalues.InvalidValue { +func (v DataAmountValue) CheckIsValid(value string) []*InvalidValue { if !dataAmountCheckPattern.MatchString(value) { - return []*docvalues.InvalidValue{ + return []*InvalidValue{ { Err: InvalidDataAmountError{}, Start: 0, @@ -85,7 +84,7 @@ func (v DataAmountValue) FetchCompletions(line string, cursor uint32) []protocol if line == "" || isJustDigitsPattern.MatchString(line) { completions = append( completions, - docvalues.GenerateBase10Completions(line)..., + GenerateBase10Completions(line)..., ) } diff --git a/handlers/sshd_config/fields/value-time-format.go b/doc-values/value-time-format.go similarity index 91% rename from handlers/sshd_config/fields/value-time-format.go rename to doc-values/value-time-format.go index 607ac3d..b1a3261 100644 --- a/handlers/sshd_config/fields/value-time-format.go +++ b/doc-values/value-time-format.go @@ -1,7 +1,6 @@ -package fields +package docvalues import ( - docvalues "config-lsp/doc-values" "config-lsp/utils" "fmt" "regexp" @@ -12,6 +11,7 @@ import ( var timeFormatCompletionsPattern = regexp.MustCompile(`(?i)^(\d+)([smhdw])$`) var timeFormatCheckPattern = regexp.MustCompile(`(?i)^(\d+)([smhdw]?)$`) +var isJustDigitsPattern = regexp.MustCompile(`^\d+$`) type InvalidTimeFormatError struct{} @@ -25,9 +25,9 @@ func (v TimeFormatValue) GetTypeDescription() []string { return []string{"Time value"} } -func (v TimeFormatValue) CheckIsValid(value string) []*docvalues.InvalidValue { +func (v TimeFormatValue) CheckIsValid(value string) []*InvalidValue { if !timeFormatCheckPattern.MatchString(value) { - return []*docvalues.InvalidValue{ + return []*InvalidValue{ { Err: InvalidTimeFormatError{}, Start: 0, @@ -99,7 +99,7 @@ func (v TimeFormatValue) FetchCompletions(line string, cursor uint32) []protocol if line == "" || isJustDigitsPattern.MatchString(line) { completions = append( completions, - docvalues.GenerateBase10Completions(line)..., + GenerateBase10Completions(line)..., ) } diff --git a/handlers/ssh_config/ast/listener.go b/handlers/ssh_config/ast/listener.go index a9cc359..f9dff36 100644 --- a/handlers/ssh_config/ast/listener.go +++ b/handlers/ssh_config/ast/listener.go @@ -17,12 +17,10 @@ type sshListenerContext struct { currentOption *SSHOption currentBlock SSHBlock currentKeyIsBlockOf *SSHBlockType - currentIndexes *SSHIndexes } func createListenerContext() *sshListenerContext { context := new(sshListenerContext) - context.currentIndexes = NewSSHIndexes() return context } diff --git a/handlers/ssh_config/ast/ssh_config_fields.go b/handlers/ssh_config/ast/ssh_config_fields.go index 55e0960..ec5ccd0 100644 --- a/handlers/ssh_config/ast/ssh_config_fields.go +++ b/handlers/ssh_config/ast/ssh_config_fields.go @@ -1,6 +1,10 @@ package ast -import "config-lsp/common" +import ( + "config-lsp/common" + + "github.com/emirpasic/gods/maps/treemap" +) type SSHBlockType uint8 @@ -13,6 +17,7 @@ type SSHBlock interface { GetBlockType() SSHBlockType AddOption(option *SSHOption) SetEnd(common.Location) + GetOptions() *treemap.Map } func (b *SSHMatchBlock) GetBlockType() SSHBlockType { @@ -27,6 +32,10 @@ func (b *SSHMatchBlock) SetEnd(end common.Location) { b.LocationRange.End = end } +func (b *SSHMatchBlock) GetOptions() *treemap.Map { + return b.Options +} + func (b *SSHHostBlock) GetBlockType() SSHBlockType { return SSHBlockTypeHost } @@ -39,6 +48,10 @@ func (b *SSHHostBlock) SetEnd(end common.Location) { b.LocationRange.End = end } +func (b *SSHHostBlock) GetOptions() *treemap.Map { + return b.Options +} + type SSHType uint8 const ( diff --git a/handlers/ssh_config/fields/fields.go b/handlers/ssh_config/fields/fields.go index 83237d3..d90b649 100644 --- a/handlers/ssh_config/fields/fields.go +++ b/handlers/ssh_config/fields/fields.go @@ -1,6 +1,17 @@ package fields -import docvalues "config-lsp/doc-values" +import ( + "config-lsp/common/ssh" + docvalues "config-lsp/doc-values" + "regexp" +) + +var ZERO = 0 +var MAX_PORT = 65535 + +var AllowedDuplicateOptions = map[string]struct{}{ + "CertificateFile": {}, +} var Options = map[string]docvalues.DocumentationValue{ "Host": { @@ -20,24 +31,51 @@ var Options = map[string]docvalues.DocumentationValue{ }, "AddKeysToAgent": { Documentation: `Specifies whether keys should be automatically added to a running ssh-agent(1). If this option is set to yes and a key is loaded from a file, the key and its passphrase are added to the agent with the default lifetime, as if by ssh-add(1). If this option is set to ask, ssh(1) will require confirmation using the SSH_ASKPASS program before adding a key (see ssh-add(1) for details). If this option is set to confirm, each use of the key must be confirmed, as if the -c option was specified to ssh-add(1). If this option is set to no, no keys are added to the agent. Alternately, this option may be specified as a time interval using the format described in the TIME FORMATS section of sshd_config(5) to specify the key's lifetime in ssh-agent(1), after which it will automatically be removed. The argument must be no (the default), yes, confirm (optionally followed by a time interval), ask or a time interval.`, - Value: docvalues.StringValue{}, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("no"), + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("confirm"), + docvalues.CreateEnumString("ask"), + }, + }, + docvalues.TimeFormatValue{}, + }, + }, }, "AddressFamily": { - Documentation: `Specifies which address family to use when connecting. Valid arguments are any (the default), inet - (use IPv4 only), or inet6 (use IPv6 only).`, - Value: docvalues.StringValue{}, + Documentation: `Specifies which address family to use when connecting. Valid arguments are any (the default), inet (use IPv4 only), or inet6 (use IPv6 only).`, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("any"), + docvalues.CreateEnumString("inet"), + docvalues.CreateEnumString("inet6"), + }, + }, }, "BatchMode": { Documentation: `If set to yes, user interaction such as password prompts and host key confirmation requests will be disabled. This option is useful in scripts and other batch jobs where no user is present to interact with ssh(1). The argument must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "BindAddress": { Documentation: `Use the specified address on the local machine as the source address of the connection. Only useful on systems with more than one address.`, - Value: docvalues.StringValue{}, + Value: docvalues.IPAddressValue{ + AllowIPv4: true, + AllowIPv6: true, + AllowRange: false, + }, }, "BindInterface": { Documentation: `Use the address of the specified interface on the local machine as the source address of the connection.`, - Value: docvalues.StringValue{}, + Value: docvalues.IPAddressValue{ + AllowIPv4: false, + AllowIPv6: false, + AllowRange: false, + }, }, "CanonicalDomains": { Documentation: `When CanonicalizeHostname is enabled, this option specifies the list of domain suffixes in which to search for the specified destination host.`, @@ -45,23 +83,27 @@ var Options = map[string]docvalues.DocumentationValue{ }, "CanonicalizeFallbackLocal": { Documentation: `Specifies whether to fail with an error when hostname canonicalization fails. The default, yes, will attempt to look up the unqualified hostname using the system resolver's search rules. A value of no will cause ssh(1) to fail instantly if CanonicalizeHostname is enabled and the target hostname cannot be found in any of the domains specified by CanonicalDomains.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "CanonicalizeHostname": { Documentation: `Controls whether explicit hostname canonicalization is performed. The default, no, is not to perform any name rewriting and let the system resolver handle all hostname lookups. If set to yes then, for connections that do not use a ProxyCommand or ProxyJump, ssh(1) will attempt to canonicalize the hostname specified on the command line using the CanonicalDomains suffixes and CanonicalizePermittedCNAMEs rules. If CanonicalizeHostname is set to always, then canonicalization is applied to proxied connections too. If this option is enabled, then the configuration files are processed again using the new target name to pick up any new configuration in matching Host and Match stanzas. A value of none disables the use of a ProxyJump host.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "CanonicalizeMaxDots": { Documentation: `Specifies the maximum number of dot characters in a hostname before canonicalization is disabled. The default, 1, allows a single dot (i.e. hostname.subdomain).`, - Value: docvalues.StringValue{}, + Value: docvalues.PositiveNumberValue(), }, "CanonicalizePermittedCNAMEs": { Documentation: `Specifies rules to determine whether CNAMEs should be followed when canonicalizing hostnames. The rules consist of one or more arguments of source_domain_list:target_domain_list, where source_domain_list is a pattern-list of domains that may follow CNAMEs in canonicalization, and target_domain_list is a pattern-list of domains that they may resolve to. For example, '*.a.example.com:*.b.example.com,*.c.example.com' will allow hostnames matching '*.a.example.com' to be canonicalized to names in the '*.b.example.com' or '*.c.example.com' domains. A single argument of 'none' causes no CNAMEs to be considered for canonicalization. This is the default behaviour.`, - Value: docvalues.StringValue{}, + Value: docvalues.ArrayValue{ + Separator: ",", + DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor, + SubValue: docvalues.StringValue{}, + }, }, "CASignatureAlgorithms": { Documentation: `Specifies which algorithms are allowed for signing of certificates by certificate authorities (CAs). The default is: @@ -75,22 +117,86 @@ rsa-sha2-512,rsa-sha2-256 If the specified list begins with a ‘+’ character, then the specified algorithms will be appended to the default set instead of replacing them. If the specified list begins with a ‘-’ character, then the specified algorithms (including wildcards) will be removed from the default set instead of replacing them. ssh(1) will not accept host certificates signed using algorithms other than those specified.`, - Value: docvalues.StringValue{}, + Value: docvalues.PrefixWithMeaningValue{ + Prefixes: []docvalues.Prefix{ + { + Prefix: "+", + Meaning: "Appende to the default set", + }, + { + Prefix: "-", + Meaning: "Remove from the default set", + }, + }, + SubValue: docvalues.ArrayValue{ + Separator: ",", + DuplicatesExtractor: &docvalues.DuplicatesAllowedExtractor, + // TODO: Add + SubValue: docvalues.StringValue{}, + }, + }, }, "CertificateFile": { Documentation: `Specifies a file from which the user's certificate is read. A corresponding private key must be provided separately in order to use this certificate either from an IdentityFile directive or -i flag to ssh(1), via ssh-agent(1), or via a PKCS11Provider or SecurityKeyProvider. Arguments to CertificateFile may use the tilde syntax to refer to a user's home directory, the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section. It is possible to have multiple certificate files specified in configuration files; these certificates will be tried in sequence. Multiple CertificateFile directives will add to the list of certificates used for authentication.`, - Value: docvalues.StringValue{}, + Value: docvalues.PathValue{ + RequiredType: docvalues.PathTypeFile, + }, }, "ChannelTimeout": { - Documentation: `Open X11 forwarding sessions.`, - Value: docvalues.StringValue{}, + Documentation: `Specifies whether and how quickly ssh(1) should close inactive channels. Timeouts are specified as one or more “type=interval” pairs separated by whitespace, where the “type” must be the special keyword “global” or a channel type name from the list below, optionally containing wildcard characters. + +The timeout value “interval” is specified in seconds or may use any of the units documented in the TIME FORMATS section. For example, “session=5m” would cause interactive sessions to terminate after five minutes of inactivity. Specifying a zero value disables the inactivity timeout. + +The special timeout “global” applies to all active channels, taken together. Traffic on any active channel will reset the timeout, but when the timeout expires then all open channels will be closed. Note that this global timeout is not matched by wildcards and must be specified explicitly. + +The available channel type names include: + +agent-connection + Open connections to ssh-agent(1). +direct-tcpip, direct-streamlocal@openssh.com + Open TCP or Unix socket (respectively) connections that have been established from a ssh(1) local forwarding, i.e. LocalForward or DynamicForward. +forwarded-tcpip, forwarded-streamlocal@openssh.com + Open TCP or Unix socket (respectively) connections that have been established to a sshd(8) listening on behalf of a ssh(1) remote forwarding, i.e. RemoteForward. +session + The interactive main session, including shell session, command execution, scp(1), sftp(1), etc. +tun-connection + Open TunnelForward connections. +x11-connection + Open X11 forwarding sessions. + +Note that in all the above cases, terminating an inactive session does not guarantee to remove all resources associated with the session, e.g. shell processes or X11 clients relating to the session may continue to execute. + +Moreover, terminating an inactive channel or session does not necessarily close the SSH connection, nor does it prevent a client from requesting another channel of the same type. In particular, expiring an inactive forwarding session does not prevent another identical forwarding from being subsequently created. + +The default is not to expire channels of any type for inactivity.`, + Value: docvalues.ArrayValue{ + Separator: " ", + DuplicatesExtractor: &channelTimeoutExtractor, + SubValue: docvalues.KeyValueAssignmentValue{ + ValueIsOptional: false, + Separator: "=", + Key: docvalues.EnumValue{ + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("global"), + docvalues.CreateEnumString("agent-connection"), + docvalues.CreateEnumString("direct-tcpip"), + docvalues.CreateEnumString("direct-streamlocal@openssh.com"), + docvalues.CreateEnumString("forwarded-tcpip"), + docvalues.CreateEnumString("forwarded-streamlocal@openssh.com"), + docvalues.CreateEnumString("session"), + docvalues.CreateEnumString("tun-connection"), + docvalues.CreateEnumString("x11-connection"), + }, + }, + Value: docvalues.TimeFormatValue{}, + }, + }, }, "CheckHostIP": { - Documentation: `If set to yes, ssh(1) will additionally check the host IP address in the known_hosts file. This allows it to detect if a host key changed due to DNS spoofing and will add addresses of destination hosts to ~/.ssh/known_hosts in the process, regardless of the setting of StrictHostKeyChecking. If the option is set to no (the default), the check will not be - executed.`, - Value: docvalues.StringValue{}, + Documentation: `If set to yes, ssh(1) will additionally check the host IP address in the known_hosts file. This allows it to detect if a host key changed due to DNS spoofing and will add addresses of destination hosts to ~/.ssh/known_hosts in the process, regardless of the setting of StrictHostKeyChecking. If the option is set to no (the default), the check will not be executed.`, + Value: booleanEnumValue, }, "Ciphers": { Documentation: `Specifies the ciphers allowed and their order of preference. Multiple ciphers must be comma-separated. If the specified list begins with a @@ -116,124 +222,168 @@ aes128-gcm@openssh.com,aes256-gcm@openssh.com The list of available ciphers may also be obtained using 'ssh -Q cipher'.`, - Value: docvalues.StringValue{}, + Value: prefixPlusMinusCaret([]docvalues.EnumString{ + docvalues.CreateEnumString("3des-cbc"), + docvalues.CreateEnumString("aes128-cbc"), + docvalues.CreateEnumString("aes192-cbc"), + docvalues.CreateEnumString("aes256-cbc"), + docvalues.CreateEnumString("aes128-ctr"), + docvalues.CreateEnumString("aes192-ctr"), + docvalues.CreateEnumString("aes256-ctr"), + docvalues.CreateEnumString("aes128-gcm@openssh.com"), + docvalues.CreateEnumString("aes256-gcm@openssh.com"), + docvalues.CreateEnumString("chacha20-poly1305@openssh.com"), + }), }, "ClearAllForwardings": { Documentation: `Specifies that all local, remote, and dynamic port forwardings specified in the configuration files or on the command line be cleared. This option is primarily useful when used from the ssh(1) command line to clear port forwardings set in configuration files, and is automatically set by scp(1) and sftp(1). The argument must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "Compression": { - Documentation: `Specifies whether to use compression. The argument must be yes or no (the - default).`, - Value: docvalues.StringValue{}, + Documentation: `Specifies whether to use compression. The argument must be yes or no (the default).`, + Value: booleanEnumValue, }, "ConnectionAttempts": { Documentation: `Specifies the number of tries (one per second) to make before exiting. The argument must be an integer. This may be useful in scripts if the connection sometimes fails. The default is 1.`, - Value: docvalues.StringValue{}, + Value: docvalues.NumberValue{}, }, "ConnectTimeout": { Documentation: `Specifies the timeout (in seconds) used when connecting to the SSH server, instead of using the default system TCP timeout. This timeout is applied both to establishing the connection and to performing the initial SSH protocol handshake and key exchange.`, - Value: docvalues.StringValue{}, + Value: docvalues.NumberValue{}, }, "ControlMaster": { Documentation: `Enables the sharing of multiple sessions over a single network connection. When set to yes, ssh(1) will listen for connections on a control socket specified using the ControlPath argument. Additional sessions can connect to this socket using the same ControlPath with ControlMaster set to no (the default). These sessions will try to reuse the master instance's network connection rather than initiating new ones, but will fall back to connecting normally if the control socket does not exist, or is not listening. Setting this to ask will cause ssh(1) to listen for control connections, but require confirmation using ssh-askpass(1). If the ControlPath cannot be opened, ssh(1) will continue without connecting to a master instance. X11 and ssh-agent(1) forwarding is supported over these multiplexed connections, however the display and agent forwarded will be the one belonging to the master connection i.e. it is not possible to forward multiple displays or agents. Two additional options allow for opportunistic multiplexing: try to use a master connection but fall back to creating a new one if one does not already exist. These options are: auto and autoask. The latter requires confirmation like the ask option.`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("no"), + docvalues.CreateEnumString("ask"), + docvalues.CreateEnumString("auto"), + docvalues.CreateEnumString("autoask"), + }, + }, }, "ControlPath": { - Documentation: `Specify the path to the control socket used for connection sharing as described in the ControlMaster section above or the string none to disable connection sharing. Arguments to ControlPath may use the tilde syntax to refer to a user's home directory, the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section. It is recommended that any ControlPath used for opportunistic connection sharing include at least %h, %p, and %r - (or alternatively %C) and be placed in a directory that is not writable by other users. This ensures that shared connections are uniquely - identified.`, + Documentation: `Specify the path to the control socket used for connection sharing as described in the ControlMaster section above or the string none to disable connection sharing. Arguments to ControlPath may use the tilde syntax to refer to a user's home directory, the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section. It is recommended that any ControlPath used for opportunistic connection sharing include at least %h, %p, and %r (or alternatively %C) and be placed in a directory that is not writable by other users. This ensures that shared connections are uniquely identified.`, Value: docvalues.StringValue{}, }, "ControlPersist": { - Documentation: `When used in conjunction with ControlMaster, specifies that the master connection should remain open in the background - (waiting for future client connections) after the initial client connection has been closed. If set to no (the default), then the master connection will not be placed into the background, and will close as soon as the initial client connection is closed. If set to yes or 0, then the master connection will remain in the background indefinitely (until killed or closed via a mechanism such as the 'ssh -O exit'). If set to a time in seconds, or a time in any of the formats documented in sshd_config(5), then the backgrounded master connection will automatically terminate after it has remained idle (with no client connections) for the specified time.`, - Value: docvalues.StringValue{}, + Documentation: `When used in conjunction with ControlMaster, specifies that the master connection should remain open in the background (waiting for future client connections) after the initial client connection has been closed. If set to no (the default), then the master connection will not be placed into the background, and will close as soon as the initial client connection is closed. If set to yes or 0, then the master connection will remain in the background indefinitely (until killed or closed via a mechanism such as the 'ssh -O exit'). If set to a time in seconds, or a time in any of the formats documented in sshd_config(5), then the backgrounded master connection will automatically terminate after it has remained idle (with no client connections) for the specified time.`, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + booleanEnumValue, + docvalues.TimeFormatValue{}, + docvalues.PositiveNumberValue(), + }, + }, }, "DynamicForward": { - Documentation: `Specifies that a TCP port on the local machine be forwarded over the secure channel, and the application protocol is then used to determine where to connect to from the remote machine. - The argument must be + Documentation: `Specifies that a TCP port on the local machine be forwarded over the secure channel, and the application protocol is then used to determine where to connect to from the remote machine. The argument must be [bind_address:]port. IPv6 addresses can be specified by enclosing addresses in square brackets. By default, the local port is bound in accordance with the GatewayPorts setting. However, an explicit bind_address may be used to bind the connection to a specific address. The bind_address of localhost indicates that the listening port be bound for local use only, while an empty address or ‘*’ indicates that the port should be available from all interfaces. Currently the SOCKS4 and SOCKS5 protocols are supported, and ssh(1) will act as a SOCKS server. Multiple forwardings may be specified, and additional forwardings can be given on the command line. Only the superuser can forward privileged ports.`, - Value: docvalues.StringValue{}, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + docvalues.NumberValue{Min: &ZERO, Max: &MAX_PORT}, + docvalues.KeyValueAssignmentValue{ + Key: docvalues.IPAddressValue{ + AllowIPv4: true, + AllowIPv6: true, + AllowRange: false, + }, + Value: docvalues.NumberValue{Min: &ZERO, Max: &MAX_PORT}, + }, + }, + }, }, "EnableEscapeCommandline": { - Documentation: `Enables the command line option in the EscapeChar menu for interactive sessions (default - ‘~C’). By default, the command line is disabled.`, + Documentation: `Enables the command line option in the EscapeChar menu for interactive sessions (default ‘~C’). By default, the command line is disabled.`, Value: docvalues.StringValue{}, }, "EnableSSHKeysign": { Documentation: `Setting this option to yes in the global client configuration file /etc/ssh/ssh_config enables the use of the helper program ssh-keysign(8) during HostbasedAuthentication. The argument must be yes or no (the default). This option should be placed in the non-hostspecific section. See ssh-keysign(8) for more information.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "EscapeChar": { - Documentation: `Sets the escape character (default: - ‘~’). The escape character can also be set on the command line. The argument should be a single character, - ‘^’ followed by a letter, or none to disable the escape character entirely - (making the connection transparent for binary data).`, + Documentation: `Sets the escape character (default: ‘~’). The escape character can also be set on the command line. The argument should be a single character, ‘^’ followed by a letter, or none to disable the escape character entirely (making the connection transparent for binary data).`, Value: docvalues.StringValue{}, }, "ExitOnForwardFailure": { Documentation: `Specifies whether ssh(1) should terminate the connection if it cannot set up all requested dynamic, tunnel, local, and remote port forwardings, (e.g. if either end is unable to bind and listen on a specified port). Note that ExitOnForwardFailure does not apply to connections made over port forwardings and will not, for example, cause ssh(1) to exit if TCP connections to the ultimate forwarding destination fail. The argument must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "FingerprintHash": { Documentation: `Specifies the hash algorithm used when displaying key fingerprints. Valid options are: md5 and sha256 (the default).`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("md5"), + docvalues.CreateEnumString("sha256"), + }, + }, }, "ForkAfterAuthentication": { Documentation: `Requests ssh to go to background just before command execution. This is useful if ssh is going to ask for passwords or passphrases, but the user wants it in the background. This implies the StdinNull configuration option being set to “yes”. The recommended way to start X11 programs at a remote site is with something like ssh -f host xterm, which is the same as ssh host xterm if the ForkAfterAuthentication configuration option is set to “yes”. If the ExitOnForwardFailure configuration option is set to “yes”, then a client started with the ForkAfterAuthentication configuration option being set to “yes” will wait for all remote port forwards to be successfully established before placing itself in the background. The argument to this keyword must be yes (same as the -f option) or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "ForwardAgent": { - Documentation: `Specifies whether the connection to the authentication agent (if any) will be forwarded to the remote machine. The argument may be yes, no (the default), an explicit path to an agent socket or the name of an environment variable - (beginning with ‘$’) in which to find the path. + Documentation: `Specifies whether the connection to the authentication agent (if any) will be forwarded to the remote machine. The argument may be yes, no (the default), an explicit path to an agent socket or the name of an environment variable (beginning with ‘$’) in which to find the path. Agent forwarding should be enabled with caution. Users with the ability to bypass file permissions on the remote host (for the agent's Unix-domain socket) can access the local agent through the forwarded connection. An attacker cannot obtain key material from the agent, however they can perform operations on the keys that enable them to authenticate using the identities loaded into the agent.`, - Value: docvalues.StringValue{}, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + booleanEnumValue, + docvalues.StringValue{}, + }, + }, }, "ForwardX11": { Documentation: `Specifies whether X11 connections will be automatically redirected over the secure channel and DISPLAY set. The argument must be yes or no (the default). X11 forwarding should be enabled with caution. Users with the ability to bypass file permissions on the remote host (for the user's X11 authorization database) can access the local X11 display through the forwarded connection. An attacker may then be able to perform activities such as keystroke monitoring if the ForwardX11Trusted option is also enabled.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "ForwardX11Timeout": { Documentation: `Specify a timeout for untrusted X11 forwarding using the format described in the TIME FORMATS section of sshd_config(5). X11 connections received by ssh(1) after this time will be refused. Setting ForwardX11Timeout to zero will disable the timeout and permit X11 forwarding for the life of the connection. The default is to disable untrusted X11 forwarding after twenty minutes has elapsed.`, - Value: docvalues.StringValue{}, + Value: docvalues.TimeFormatValue{}, }, "ForwardX11Trusted": { Documentation: `If this option is set to yes, remote X11 clients will have full access to the original X11 display. If this option is set to no (the default), remote X11 clients will be considered untrusted and prevented from stealing or tampering with data belonging to trusted X11 clients. Furthermore, the xauth(1) token used for the session will be set to expire after 20 minutes. Remote clients will be refused access after this time. See the X11 SECURITY extension specification for full details on the restrictions imposed on untrusted clients.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "GatewayPorts": { - Documentation: `Specifies whether remote hosts are allowed to connect to local forwarded ports. By default, ssh(1) binds local port forwardings to the loopback address. This prevents other remote hosts from connecting to forwarded ports. GatewayPorts can be used to specify that ssh should bind local port forwardings to the wildcard address, thus allowing remote hosts to connect to forwarded ports. The argument must be yes or no (the - default).`, - Value: docvalues.StringValue{}, + Documentation: `Specifies whether remote hosts are allowed to connect to local forwarded ports. By default, ssh(1) binds local port forwardings to the loopback address. This prevents other remote hosts from connecting to forwarded ports. GatewayPorts can be used to specify that ssh should bind local port forwardings to the wildcard address, thus allowing remote hosts to connect to forwarded ports. The argument must be yes or no (the default).`, + Value: booleanEnumValue, }, "GlobalKnownHostsFile": { Documentation: `Specifies one or more files to use for the global host key database, separated by whitespace. The default is /etc/ssh/ssh_known_hosts, /etc/ssh/ssh_known_hosts2.`, - Value: docvalues.StringValue{}, + Value: docvalues.ArrayValue{ + Separator: " ", + DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor, + SubValue: docvalues.PathValue{ + RequiredType: docvalues.PathTypeFile, + }, + }, }, "GSSAPIAuthentication": { Documentation: `Specifies whether user authentication based on GSSAPI is allowed. The default is no.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "GSSAPIDelegateCredentials": { Documentation: `Forward (delegate) credentials to the server. The default is no.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "HashKnownHosts": { Documentation: `Indicates that ssh(1) should hash host names and addresses when they are added to ~/.ssh/known_hosts. These hashed names may be used normally by ssh(1) and sshd(8), but they do not visually reveal identifying information if the file's contents are disclosed. The default is no. Note that existing names and addresses in known hosts files will not be converted automatically, but may be manually hashed using ssh-keygen(1).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "HostbasedAcceptedAlgorithms": { Documentation: `Specifies the signature algorithms that will be used for hostbased authentication as a comma-separated list of patterns. Alternately if the specified list begins with a ‘+’ character, then the specified signature algorithms will be appended to the default set instead of replacing them. If the specified list begins with a ‘-’ character, then the specified signature algorithms (including wildcards) will be removed from the default set instead of replacing them. If the specified list begins with a ‘^’ character, then the specified signature algorithms will be placed at the head of the default set. The default for this option is: @@ -253,11 +403,22 @@ sk-ecdsa-sha2-nistp256@openssh.com, rsa-sha2-512,rsa-sha2-256 The -Q option of ssh(1) may be used to list supported signature algorithms. This was formerly named HostbasedKeyTypes.`, - Value: docvalues.StringValue{}, + Value: docvalues.CustomValue{ + FetchValue: func(_ docvalues.CustomValueContext) docvalues.Value { + options, err := ssh.QueryOpenSSHOptions("HostbasedAcceptedAlgorithms") + + if err != nil { + // Fallback + options, _ = ssh.QueryOpenSSHOptions("HostbasedAcceptedKeyTypes") + } + + return prefixPlusMinusCaret(options) + }, + }, }, "HostbasedAuthentication": { Documentation: `Specifies whether to try rhosts based authentication with public key authentication. The argument must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "HostKeyAlgorithms": { Documentation: `Specifies the host key signature algorithms that the client wants to use in order of preference. Alternately if the specified list begins with a @@ -280,7 +441,13 @@ rsa-sha2-512,rsa-sha2-256 If hostkeys are known for the destination host then this default is modified to prefer their algorithms. The list of available signature algorithms may also be obtained using 'ssh -Q HostKeyAlgorithms'.`, - Value: docvalues.StringValue{}, + Value: docvalues.CustomValue{ + FetchValue: func(_ docvalues.CustomValueContext) docvalues.Value { + options, _ := ssh.QueryOpenSSHOptions("HostKeyAlgorithms") + + return prefixPlusMinusCaret(options) + }, + }, }, "HostKeyAlias": { Documentation: `Specifies an alias that should be used instead of the real host name when looking up or saving the host key in the host key database files and when validating host certificates. This option is useful for tunneling SSH connections or for multiple servers running on a single host.`, @@ -292,11 +459,10 @@ rsa-sha2-512,rsa-sha2-256 }, "IdentitiesOnly": { Documentation: `Specifies that ssh(1) should only use the configured authentication identity and certificate files (either the default files, or those explicitly configured in the ssh_config files or passed on the ssh(1) command-line), even if ssh-agent(1) or a PKCS11Provider or SecurityKeyProvider offers more identities. The argument to this keyword must be yes or no (the default). This option is intended for situations where ssh-agent offers many different identities.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "IdentityAgent": { - Documentation: `Specifies the UNIX-domain socket used to communicate with the authentication agent. - This option overrides the SSH_AUTH_SOCK environment variable and can be used to select a specific agent. Setting the socket name to none disables the use of an authentication agent. If the string 'SSH_AUTH_SOCK' is specified, the location of the socket will be read from the SSH_AUTH_SOCK environment variable. Otherwise if the specified value begins with a ‘$’ character, then it will be treated as an environment variable containing the location of the socket. + Documentation: `Specifies the UNIX-domain socket used to communicate with the authentication agent. This option overrides the SSH_AUTH_SOCK environment variable and can be used to select a specific agent. Setting the socket name to none disables the use of an authentication agent. If the string 'SSH_AUTH_SOCK' is specified, the location of the socket will be read from the SSH_AUTH_SOCK environment variable. Otherwise if the specified value begins with a '$' character, then it will be treated as an environment variable containing the location of the socket. Arguments to IdentityAgent may use the tilde syntax to refer to a user's home directory, the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section.`, Value: docvalues.StringValue{}, }, @@ -319,19 +485,77 @@ rsa-sha2-512,rsa-sha2-256 "Include": { Documentation: `Include the specified configuration file(s). Multiple pathnames may be specified and each pathname may contain glob(7) wildcards, tokens as described in the TOKENS section, environment variables as described in the ENVIRONMENT VARIABLES section and, for user configurations, shell-like ‘~’ references to user home directories. Wildcards will be expanded and processed in lexical order. Files without absolute paths are assumed to be in ~/.ssh if included in a user configuration file or /etc/ssh if included from the system configuration file. Include directive may appear inside a Match or Host block to perform conditional inclusion.`, - Value: docvalues.StringValue{}, + Value: docvalues.ArrayValue{ + Separator: " ", + DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor, + SubValue: docvalues.StringValue{}, + }, }, "IPQoS": { Documentation: `Specifies the IPv4 type-of-service or DSCP class for connections. Accepted values are af11, af12, af13, af21, af22, af23, af31, af32, af33, af41, af42, af43, cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7, ef, le, lowdelay, throughput, reliability, a numeric value, or none to use the operating system default. This option may take one or two arguments, separated by whitespace. If one argument is specified, it is used as the packet class unconditionally. If two values are specified, the first is automatically selected for interactive sessions and the second for non-interactive sessions. The default is af21 (Low-Latency Data) for interactive sessions and cs1 (Lower Effort) for non-interactive sessions.`, - Value: docvalues.StringValue{}, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + docvalues.NumberValue{}, + docvalues.EnumValue{ + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("none"), + }, + }, + docvalues.ArrayValue{ + Separator: " ", + SubValue: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("af11"), + docvalues.CreateEnumString("af12"), + docvalues.CreateEnumString("af13"), + docvalues.CreateEnumString("af21"), + docvalues.CreateEnumString("af22"), + docvalues.CreateEnumString("af23"), + docvalues.CreateEnumString("af31"), + docvalues.CreateEnumString("af32"), + docvalues.CreateEnumString("af33"), + docvalues.CreateEnumString("af41"), + docvalues.CreateEnumString("af42"), + docvalues.CreateEnumString("af43"), + docvalues.CreateEnumString("cs0"), + docvalues.CreateEnumString("cs1"), + docvalues.CreateEnumString("cs2"), + docvalues.CreateEnumString("cs3"), + docvalues.CreateEnumString("cs4"), + docvalues.CreateEnumString("cs5"), + docvalues.CreateEnumString("cs6"), + docvalues.CreateEnumString("cs7"), + docvalues.CreateEnumString("ef"), + docvalues.CreateEnumString("le"), + docvalues.CreateEnumString("lowdelay"), + docvalues.CreateEnumString("throughput"), + docvalues.CreateEnumString("reliability"), + docvalues.CreateEnumString("none"), + }, + }, + }, + }, + }, }, "KbdInteractiveAuthentication": { Documentation: `Specifies whether to use keyboard-interactive authentication. The argument to this keyword must be yes (the default) or no. ChallengeResponseAuthentication is a deprecated alias for this.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "KbdInteractiveDevices": { Documentation: `Specifies the list of methods to use in keyboard-interactive authentication. Multiple method names must be comma-separated. The default is to use the server specified list. The methods available vary depending on what the server supports. For an OpenSSH server, it may be zero or more of: bsdauth, pam, and skey.`, - Value: docvalues.StringValue{}, + Value: docvalues.ArrayValue{ + Separator: ",", + DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor, + SubValue: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("bsdauth"), + docvalues.CreateEnumString("pam"), + docvalues.CreateEnumString("skey"), + }, + }, + }, }, "KexAlgorithms": { Documentation: `Specifies the permitted KEX (Key Exchange) algorithms that will be used and their preference order. The selected algorithm will be the first algorithm in this list that the server also supports. Multiple algorithms must be comma-separated. @@ -349,7 +573,21 @@ diffie-hellman-group18-sha512, diffie-hellman-group14-sha256 The list of supported key exchange algorithms may also be obtained using 'ssh -Q kex'.`, - Value: docvalues.StringValue{}, + Value: prefixPlusMinusCaret([]docvalues.EnumString{ + docvalues.CreateEnumString("curve25519-sha256"), + docvalues.CreateEnumString("curve25519-sha256@libssh.org"), + docvalues.CreateEnumString("diffie-hellman-group1-sha1"), + docvalues.CreateEnumString("diffie-hellman-group14-sha1"), + docvalues.CreateEnumString("diffie-hellman-group14-sha256"), + docvalues.CreateEnumString("diffie-hellman-group16-sha512"), + docvalues.CreateEnumString("diffie-hellman-group18-sha512"), + docvalues.CreateEnumString("diffie-hellman-group-exchange-sha1"), + docvalues.CreateEnumString("diffie-hellman-group-exchange-sha256"), + docvalues.CreateEnumString("ecdh-sha2-nistp256"), + docvalues.CreateEnumString("ecdh-sha2-nistp384"), + docvalues.CreateEnumString("ecdh-sha2-nistp521"), + docvalues.CreateEnumString("sntrup761x25519-sha512@openssh.com"), + }), }, "KnownHostsCommand": { Documentation: `Specifies a command to use to obtain a list of host keys, in addition to those listed in UserKnownHostsFile and GlobalKnownHostsFile. This command is executed after the files have been read. It may write host key lines to standard output in identical format to the usual files (described in the VERIFYING HOST KEYS section in ssh(1)). Arguments to KnownHostsCommand accept the tokens described in the TOKENS section. The command may be invoked multiple times per connection: once when preparing the preference list of host key algorithms to use, again to obtain the host key for the requested host name and, if CheckHostIP is enabled, one more time to obtain the host key matching the server's address. If the command exits abnormally or returns a non-zero exit status then the connection is terminated.`, @@ -365,11 +603,35 @@ diffie-hellman-group14-sha256 Documentation: `Specifies that a TCP port on the local machine be forwarded over the secure channel to the specified host and port from the remote machine. The first argument specifies the listener and may be [bind_address:]port or a Unix domain socket path. The second argument is the destination and may be host:hostport or a Unix domain socket path if the remote host supports it. IPv6 addresses can be specified by enclosing addresses in square brackets. Multiple forwardings may be specified, and additional forwardings can be given on the command line. Only the superuser can forward privileged ports. By default, the local port is bound in accordance with the GatewayPorts setting. However, an explicit bind_address may be used to bind the connection to a specific address. The bind_address of localhost indicates that the listening port be bound for local use only, while an empty address or ‘*’ indicates that the port should be available from all interfaces. Unix domain socket paths may use the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section.`, - Value: docvalues.StringValue{}, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + docvalues.NumberValue{Min: &ZERO, Max: &MAX_PORT}, + docvalues.KeyValueAssignmentValue{ + Key: docvalues.IPAddressValue{ + AllowIPv4: true, + AllowIPv6: true, + AllowRange: false, + }, + }, + }, + }, }, "LogLevel": { Documentation: `Gives the verbosity level that is used when logging messages from ssh(1). The possible values are: QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is INFO. DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher levels of verbose output.`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("QUIET"), + docvalues.CreateEnumString("FATAL"), + docvalues.CreateEnumString("ERROR"), + docvalues.CreateEnumString("INFO"), + docvalues.CreateEnumString("VERBOSE"), + docvalues.CreateEnumString("DEBUG"), + docvalues.CreateEnumString("DEBUG1"), + docvalues.CreateEnumString("DEBUG2"), + docvalues.CreateEnumString("DEBUG3"), + }, + }, }, "LogVerbose": { Documentation: `Specify one or more overrides to LogLevel. An override consists of one or more pattern lists that matches the source file, function and line number to force detailed logging for. For example, an override pattern of: @@ -392,51 +654,84 @@ umac-64@openssh.com,umac-128@openssh.com, hmac-sha2-256,hmac-sha2-512,hmac-sha1 The list of available MAC algorithms may also be obtained using 'ssh -Q mac'.`, - Value: docvalues.StringValue{}, + Value: prefixPlusMinusCaret([]docvalues.EnumString{ + docvalues.CreateEnumString("hmac-md5"), + docvalues.CreateEnumString("hmac-md5-96"), + docvalues.CreateEnumString("hmac-sha1"), + docvalues.CreateEnumString("hmac-sha1-96"), + docvalues.CreateEnumString("hmac-sha2-256"), + docvalues.CreateEnumString("hmac-sha2-256"), + docvalues.CreateEnumString("hmac-sha2-512"), + docvalues.CreateEnumString("umac-64@openssh.com"), + docvalues.CreateEnumString("umac-128@openssh.com"), + docvalues.CreateEnumString("hmac-md5-etm@openssh.com"), + docvalues.CreateEnumString("hmac-md5-96-etm@openssh.com"), + docvalues.CreateEnumString("hmac-sha1-etm@openssh.com"), + docvalues.CreateEnumString("hmac-sha1-96-etm@openssh.com"), + docvalues.CreateEnumString("hmac-sha2-256-etm@openssh.com"), + docvalues.CreateEnumString("hmac-sha2-512-etm@openssh.com"), + docvalues.CreateEnumString("umac-64-etm@openssh.com"), + docvalues.CreateEnumString("umac-128-etm@openssh.com"), + }), }, "NoHostAuthenticationForLocalhost": { Documentation: `Disable host authentication for localhost (loopback addresses). The argument to this keyword must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "NumberOfPasswordPrompts": { Documentation: `Specifies the number of password prompts before giving up. The argument to this keyword must be an integer. The default is 3.`, - Value: docvalues.StringValue{}, + Value: docvalues.PositiveNumberValue(), }, "ObscureKeystrokeTiming": { Documentation: `Specifies whether ssh(1) should try to obscure inter-keystroke timings from passive observers of network traffic. If enabled, then for interactive sessions, ssh(1) will send keystrokes at fixed intervals of a few tens of milliseconds and will send fake keystroke packets for some time after typing ceases. The argument to this keyword must be yes, no or an interval specifier of the form interval:milliseconds (e.g. interval:80 for 80 milliseconds). The default is to obscure keystrokes using a 20ms packet interval. Note that smaller intervals will result in higher fake keystroke packet rates.`, - Value: docvalues.StringValue{}, + Value: docvalues.OrValue{ + Values: []docvalues.Value{ + booleanEnumValue, + docvalues.RegexValue{ + Regex: *regexp.MustCompile(`^interval:[0-9]+$`), + }, + }, + }, }, "PasswordAuthentication": { Documentation: `Specifies whether to use password authentication. The argument to this keyword must be yes (the default) or no.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "PermitLocalCommand": { Documentation: `Allow local command execution via the LocalCommand option or using the !command escape sequence in ssh(1). The argument must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "PermitRemoteOpen": { Documentation: `Specifies the destinations to which remote TCP port forwarding is permitted when RemoteForward is used as a SOCKS proxy. The forwarding specification must be one of the following forms: - PermitRemoteOpen host:port PermitRemoteOpen IPv4_addr:port PermitRemoteOpen - [IPv6_addr]:port + PermitRemoteOpen host:port PermitRemoteOpen IPv4_addr:port PermitRemoteOpen [IPv6_addr]:port Multiple forwards may be specified by separating them with whitespace. An argument of any can be used to remove all restrictions and permit any forwarding requests. An argument of none can be used to prohibit all forwarding requests. The wildcard ‘*’ can be used for host or port to allow all hosts or ports respectively. Otherwise, no pattern matching or address lookups are performed on supplied names.`, + // TODO: Improve Value: docvalues.StringValue{}, }, "PKCS11Provider": { Documentation: `Specifies which PKCS#11 provider to use or none to indicate that no provider should be used (the default). The argument to this keyword is a path to the PKCS#11 shared library ssh(1) should use to communicate with a PKCS#11 token providing keys for user authentication.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "Port": { Documentation: `Specifies the port number to connect on the remote host. The default is 22.`, - Value: docvalues.StringValue{}, + Value: docvalues.NumberValue{Min: &ZERO, Max: &MAX_PORT}, }, "PreferredAuthentications": { Documentation: `Specifies the order in which the client should try authentication methods. This allows a client to prefer one method (e.g. keyboard-interactive) over another method (e.g. password). The default is: - gssapi-with-mic,hostbased,publickey, -keyboard-interactive,password`, - Value: docvalues.StringValue{}, + gssapi-with-mic,hostbased,publickey,keyboard-interactive,password`, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("gssapi-with-mic"), + docvalues.CreateEnumString("hostbased"), + docvalues.CreateEnumString("publickey"), + docvalues.CreateEnumString("keyboard-interactive"), + docvalues.CreateEnumString("password"), + }, + }, }, "ProxyCommand": { Documentation: `Specifies the command to use to connect to the server. The command string extends to the end of the line, and is executed using the user's shell @@ -458,7 +753,7 @@ keyboard-interactive,password`, }, "ProxyUseFdpass": { Documentation: `Specifies that ProxyCommand will pass a connected file descriptor back to ssh(1) instead of continuing to execute and pass data. The default is no.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "PubkeyAcceptedAlgorithms": { Documentation: `Specifies the signature algorithms that will be used for public key authentication as a comma-separated list of patterns. If the specified list begins with a ‘+’ character, then the algorithms after it will be appended to the default instead of replacing it. If the specified list begins with a ‘-’ character, then the specified algorithms (including wildcards) will be removed from the default set instead of replacing them. If the specified list begins with a @@ -479,17 +774,28 @@ sk-ecdsa-sha2-nistp256@openssh.com, rsa-sha2-512,rsa-sha2-256 The list of available signature algorithms may also be obtained using 'ssh -Q PubkeyAcceptedAlgorithms'.`, - Value: docvalues.StringValue{}, + Value: docvalues.CustomValue{ + FetchValue: func(_ docvalues.CustomValueContext) docvalues.Value { + options, _ := ssh.QueryOpenSSHOptions("PubkeyAcceptedAlgorithms") + + return prefixPlusMinusCaret(options) + }, + }, }, "PubkeyAuthentication": { Documentation: `Specifies whether to try public key authentication. The argument to this keyword must be yes (the default), no, unbound or host-bound. The final two options enable public key authentication while respectively disabling or enabling the OpenSSH host-bound authentication protocol extension required for restricted ssh-agent(1) forwarding.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "RekeyLimit": { Documentation: `Specifies the maximum amount of data that may be transmitted or received before the session key is renegotiated, optionally followed by a maximum amount of time that may pass before the session key is renegotiated. The first argument is specified in bytes and may have a suffix of ‘K’, ‘M’, or ‘G’ to indicate Kilobytes, Megabytes, or Gigabytes, respectively. The default is between ‘1G’ and ‘4G’, depending on the cipher. The optional second value is specified in seconds and may use any of the units documented in the TIME FORMATS section of sshd_config(5). The default value for RekeyLimit is default none, which means that rekeying is performed after the cipher's default amount of data has been sent or received and no time based rekeying is done.`, - Value: docvalues.StringValue{}, + Value: docvalues.KeyValueAssignmentValue{ + Separator: " ", + ValueIsOptional: true, + Key: docvalues.DataAmountValue{}, + Value: docvalues.TimeFormatValue{}, + }, }, "RemoteCommand": { Documentation: `Specifies a command to execute on the remote machine after successfully connecting to the server. The command string extends to the end of the line, and is executed with the user's shell. Arguments to RemoteCommand accept the tokens described in the TOKENS section.`, @@ -507,11 +813,19 @@ rsa-sha2-512,rsa-sha2-256 "RequestTTY": { Documentation: `Specifies whether to request a pseudo-tty for the session. The argument may be one of: no (never request a TTY), yes (always request a TTY when standard input is a TTY), force (always request a TTY) or auto (request a TTY when opening a login session). This option mirrors the -t and -T flags for ssh(1).`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("no"), + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("force"), + docvalues.CreateEnumString("auto"), + }, + }, }, "RequiredRSASize": { Documentation: `Specifies the minimum RSA key size (in bits) that ssh(1) will accept. User authentication keys smaller than this limit will be ignored. Servers that present host keys smaller than this limit will cause the connection to be terminated. The default is 1024 bits. Note that this limit may only be raised from the default.`, - Value: docvalues.StringValue{}, + Value: docvalues.PositiveNumberValue(), }, "RevokedHostKeys": { Documentation: `Specifies revoked host public keys. Keys listed in this file will be refused for host authentication. Note that if this file does not exist or is not readable, then host authentication will be refused for all hosts. Keys may be specified as a text file, listing one public key per line, or as an OpenSSH Key Revocation List (KRL) as generated by ssh-keygen(1). For more information on KRLs, see the KEY REVOCATION LISTS section in ssh-keygen(1). Arguments to RevokedHostKeys may use the tilde syntax to refer to a user's home directory, the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section.`, @@ -520,7 +834,9 @@ rsa-sha2-512,rsa-sha2-256 "SecurityKeyProvider": { Documentation: `Specifies a path to a library that will be used when loading any FIDO authenticator-hosted keys, overriding the default of using the built-in USB HID support. If the specified value begins with a ‘$’ character, then it will be treated as an environment variable containing the path to the library.`, - Value: docvalues.StringValue{}, + Value: docvalues.PathValue{ + RequiredType: docvalues.PathTypeFile, + }, }, "SendEnv": { Documentation: `Specifies what variables from the local environ(7) should be sent to the server. The server must also support it, and the server must be configured to accept these environment variables. Note that the TERM environment variable is always sent whenever a pseudo-terminal is requested as it is required by the protocol. Refer to AcceptEnv in sshd_config(5) for how to configure the server. Variables are specified by name, which may contain wildcard characters. Multiple environment variables may be separated by whitespace or spread across multiple SendEnv directives. @@ -531,16 +847,14 @@ rsa-sha2-512,rsa-sha2-256 "ServerAliveCountMax": { Documentation: `Sets the number of server alive messages (see below) which may be sent without ssh(1) receiving any messages back from the server. If this threshold is reached while server alive messages are being sent, ssh will disconnect from the server, terminating the session. It is important to note that the use of server alive messages is very different from TCPKeepAlive (below). The server alive messages are sent through the encrypted channel and therefore will not be spoofable. The TCP keepalive option enabled by TCPKeepAlive is spoofable. The server alive mechanism is valuable when the client or server depend on knowing when a connection has become unresponsive. The default value is 3. If, for example, ServerAliveInterval (see below) is set to 15 and ServerAliveCountMax is left at the default, if the server becomes unresponsive, ssh will disconnect after approximately 45 seconds.`, - Value: docvalues.StringValue{}, + Value: docvalues.PositiveNumberValue(), }, "ServerAliveInterval": { Documentation: `Sets a timeout interval in seconds after which if no data has been received from the server, ssh(1) will send a message through the encrypted channel to request a response from the server. The default is 0, indicating that these messages will not be sent to the server.`, - Value: docvalues.StringValue{}, + Value: docvalues.PositiveNumberValue(), }, "SessionType": { - Documentation: `May be used to either request invocation of a subsystem on the remote system, or to prevent the execution of a remote command at all. The latter is useful for just forwarding ports. The argument to this keyword must be none (same as the -N option), subsystem (same as the - -s option) or default - (shell or command execution).`, + Documentation: `May be used to either request invocation of a subsystem on the remote system, or to prevent the execution of a remote command at all. The latter is useful for just forwarding ports. The argument to this keyword must be none (same as the -N option), subsystem (same as the -s option) or default (shell or command execution).`, Value: docvalues.StringValue{}, }, "SetEnv": { @@ -548,37 +862,59 @@ rsa-sha2-512,rsa-sha2-256 Value: docvalues.StringValue{}, }, "StdinNull": { - Documentation: `Redirects stdin from /dev/null (actually, prevents reading from stdin). Either this or the equivalent - -n option must be used when ssh is run in the background. The argument to this keyword must be yes (same as the - -n option) or no (the default).`, - Value: docvalues.StringValue{}, + Documentation: `Redirects stdin from /dev/null (actually, prevents reading from stdin). Either this or the equivalent -n option must be used when ssh is run in the background. The argument to this keyword must be yes (same as the -n option) or no (the default).`, + Value: booleanEnumValue, }, "StreamLocalBindMask": { Documentation: `Sets the octal file creation mode mask (umask) used when creating a Unix-domain socket file for local or remote port forwarding. This option is only used for port forwarding to a Unix-domain socket file. The default value is 0177, which creates a Unix-domain socket file that is readable and writable only by the owner. Note that not all operating systems honor the file mode on Unix-domain socket files.`, - Value: docvalues.StringValue{}, + Value: docvalues.MaskValue(), }, "StreamLocalBindUnlink": { Documentation: `Specifies whether to remove an existing Unix-domain socket file for local or remote port forwarding before creating a new one. If the socket file already exists and StreamLocalBindUnlink is not enabled, ssh will be unable to forward the port to the Unix-domain socket file. This option is only used for port forwarding to a Unix-domain socket file. The argument must be yes or no (the default).`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "StrictHostKeyChecking": { Documentation: `If this flag is set to yes, ssh(1) will never automatically add host keys to the ~/.ssh/known_hosts file, and refuses to connect to hosts whose host key has changed. This provides maximum protection against man-in-the-middle (MITM) attacks, though it can be annoying when the /etc/ssh/ssh_known_hosts file is poorly maintained or when connections to new hosts are frequently made. This option forces the user to manually add all new hosts. If this flag is set to accept-new then ssh will automatically add new host keys to the user's known_hosts file, but will not permit connections to hosts with changed host keys. If this flag is set to no or off, ssh will automatically add new host keys to the user known hosts files and allow connections to hosts with changed hostkeys to proceed, subject to some restrictions. If this flag is set to ask (the default), new host keys will be added to the user known host files only after the user has confirmed that is what they really want to do, and ssh will refuse to connect to hosts whose host key has changed. The host keys of known hosts will be verified automatically in all cases.`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("accept-new"), + docvalues.CreateEnumString("no"), + docvalues.CreateEnumString("off"), + docvalues.CreateEnumString("ask"), + }, + }, }, "SyslogFacility": { Documentation: `Gives the facility code that is used when logging messages from ssh(1). The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. The default is USER.`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("DAEMON"), + docvalues.CreateEnumString("USER"), + docvalues.CreateEnumString("AUTH"), + docvalues.CreateEnumString("LOCAL0"), + docvalues.CreateEnumString("LOCAL1"), + docvalues.CreateEnumString("LOCAL2"), + docvalues.CreateEnumString("LOCAL3"), + docvalues.CreateEnumString("LOCAL4"), + docvalues.CreateEnumString("LOCAL5"), + docvalues.CreateEnumString("LOCAL6"), + docvalues.CreateEnumString("LOCAL7"), + }, + }, }, "TCPKeepAlive": { Documentation: `Specifies whether the system should send TCP keepalive messages to the other side. If they are sent, death of the connection or crash of one of the machines will be properly noticed. However, this means that connections will die if the route is down temporarily, and some people find it annoying. The default is yes (to send TCP keepalive messages), and the client will notice if the network goes down or the remote host dies. This is important in scripts, and many users want it too. To disable TCP keepalive messages, the value should be set to no. See also ServerAliveInterval for protocol-level keepalives.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "Tag": { Documentation: `Specify a configuration tag name that may be later used by a Match directive to select a block of configuration.`, @@ -586,7 +922,15 @@ rsa-sha2-512,rsa-sha2-256 }, "Tunnel": { Documentation: `Request tun(4) device forwarding between the client and the server. The argument must be yes, point-to-point (layer 3), ethernet (layer 2), or no (the default). Specifying yes requests the default tunnel mode, which is point-to-point.`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("point-to-point"), + docvalues.CreateEnumString("ethernet"), + docvalues.CreateEnumString("no"), + }, + }, }, "TunnelDevice": { Documentation: `Specifies the tun(4) devices to open on the client @@ -602,29 +946,50 @@ rsa-sha2-512,rsa-sha2-256 If UpdateHostKeys is set to ask, then the user is asked to confirm the modifications to the known_hosts file. Confirmation is currently incompatible with ControlPersist, and will be disabled if it is enabled. Presently, only sshd(8) from OpenSSH 6.8 and greater support the 'hostkeys@openssh.com' protocol extension used to inform the client of all the server's hostkeys.`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("no"), + docvalues.CreateEnumString("ask"), + }, + }, }, "User": { Documentation: `Specifies the user to log in as. This can be useful when a different user name is used on different machines. This saves the trouble of having to remember to give the user name on the command line.`, - Value: docvalues.StringValue{}, + Value: docvalues.UserValue("", false), }, "UserKnownHostsFile": { Documentation: `Specifies one or more files to use for the user host key database, separated by whitespace. Each filename may use tilde notation to refer to the user's home directory, the tokens described in the TOKENS section and environment variables as described in the ENVIRONMENT VARIABLES section. A value of none causes ssh(1) to ignore any user-specific known hosts files. The default is ~/.ssh/known_hosts, ~/.ssh/known_hosts2.`, - Value: docvalues.StringValue{}, + Value: docvalues.ArrayValue{ + Separator: " ", + SubValue: docvalues.PathValue{ + RequiredType: docvalues.PathTypeFile, + }, + }, }, "VerifyHostKeyDNS": { Documentation: `Specifies whether to verify the remote key using DNS and SSHFP resource records. If this option is set to yes, the client will implicitly trust keys that match a secure fingerprint from DNS. Insecure fingerprints will be handled as if this option was set to ask. If this option is set to ask, information on fingerprint match will be displayed, but the user will still need to confirm new host keys according to the StrictHostKeyChecking option. The default is no. See also VERIFYING HOST KEYS in ssh(1).`, - Value: docvalues.StringValue{}, + Value: docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("no"), + docvalues.CreateEnumString("ask"), + }, + }, }, "VisualHostKey": { Documentation: `If this flag is set to yes, an ASCII art representation of the remote host key fingerprint is printed in addition to the fingerprint string at login and for unknown host keys. If this flag is set to no (the default), no fingerprint strings are printed at login and only the fingerprint string will be printed for unknown host keys.`, - Value: docvalues.StringValue{}, + Value: booleanEnumValue, }, "XAuthLocation": { Documentation: `Specifies the full pathname of the xauth(1) program. The default is /usr/X11R6/bin/xauth.`, - Value: docvalues.StringValue{}, + Value: docvalues.PathValue{ + RequiredType: docvalues.PathTypeFile, + }, }, } diff --git a/handlers/ssh_config/fields/utils.go b/handlers/ssh_config/fields/utils.go new file mode 100644 index 0000000..d966219 --- /dev/null +++ b/handlers/ssh_config/fields/utils.go @@ -0,0 +1,39 @@ +package fields + +import docvalues "config-lsp/doc-values" + +var booleanEnumValue = docvalues.EnumValue{ + EnforceValues: true, + Values: []docvalues.EnumString{ + docvalues.CreateEnumString("yes"), + docvalues.CreateEnumString("no"), + }, +} + +var channelTimeoutExtractor = docvalues.ExtractKeyDuplicatesExtractor("=") + +func prefixPlusMinusCaret(values []docvalues.EnumString) docvalues.PrefixWithMeaningValue { + return docvalues.PrefixWithMeaningValue{ + Prefixes: []docvalues.Prefix{ + { + Prefix: "+", + Meaning: "Append to the default set", + }, + { + Prefix: "-", + Meaning: "Remove from the default set", + }, + { + Prefix: "^", + Meaning: "Place at the head of the default set", + }, + }, + SubValue: docvalues.ArrayValue{ + Separator: ",", + DuplicatesExtractor: &docvalues.SimpleDuplicatesExtractor, + SubValue: docvalues.EnumValue{ + Values: values, + }, + }, + } +} diff --git a/handlers/ssh_config/indexes/handlers.go b/handlers/ssh_config/indexes/handlers.go new file mode 100644 index 0000000..2502870 --- /dev/null +++ b/handlers/ssh_config/indexes/handlers.go @@ -0,0 +1,129 @@ +package indexes + +import ( + "config-lsp/common" + "config-lsp/handlers/ssh_config/ast" + "config-lsp/handlers/ssh_config/fields" + "errors" + "fmt" + "regexp" +) + +var whitespacePattern = regexp.MustCompile(`\S+`) + +func NewSSHIndexes() *SSHIndexes { + return &SSHIndexes{ + AllOptionsPerName: make(map[string](map[*ast.SSHBlock]([]*ast.SSHOption)), 0), + Includes: make([]*SSHIndexIncludeLine, 0), + } +} + +func CreateIndexes(config ast.SSHConfig) (*SSHIndexes, []common.LSPError) { + errs := make([]common.LSPError, 0) + indexes := NewSSHIndexes() + + it := config.Options.Iterator() + for it.Next() { + entry := it.Value().(ast.SSHEntry) + + switch entry.GetType() { + case ast.SSHTypeOption: + errs = append(errs, addOption(indexes, entry.GetOption(), nil)...) + case ast.SSHTypeMatch: + fallthrough + case ast.SSHTypeHost: + block := entry.(ast.SSHBlock) + + errs = append(errs, addOption(indexes, entry.GetOption(), &block)...) + + it := block.GetOptions().Iterator() + for it.Next() { + option := it.Value().(*ast.SSHOption) + + errs = append(errs, addOption(indexes, option, &block)...) + } + } + } + + // Add Includes + for block, options := range indexes.AllOptionsPerName["Include"] { + includeOption := options[0] + rawValue := includeOption.OptionValue.Value.Value + pathIndexes := whitespacePattern.FindAllStringIndex(rawValue, -1) + paths := make([]*SSHIndexIncludeValue, 0) + + for _, pathIndex := range pathIndexes { + startIndex := pathIndex[0] + endIndex := pathIndex[1] + + rawPath := rawValue[startIndex:endIndex] + + offset := includeOption.OptionValue.Start.Character + path := SSHIndexIncludeValue{ + LocationRange: common.LocationRange{ + Start: common.Location{ + Line: includeOption.Start.Line, + Character: uint32(startIndex) + offset, + }, + End: common.Location{ + Line: includeOption.Start.Line, + Character: uint32(endIndex) + offset, + }, + }, + Value: rawPath, + Paths: make([]ValidPath, 0), + } + + paths = append(paths, &path) + } + + indexes.Includes[includeOption.Start.Line] = &SSHIndexIncludeLine{ + Values: paths, + Option: includeOption, + Block: block, + } + } + + return indexes, errs +} + +func addOption( + i *SSHIndexes, + option *ast.SSHOption, + block *ast.SSHBlock, +) []common.LSPError { + var errs []common.LSPError + + if optionsMap, found := i.AllOptionsPerName[option.Key.Key]; found { + if options, found := optionsMap[block]; found { + if _, duplicatesAllowed := fields.AllowedDuplicateOptions[option.Key.Key]; !duplicatesAllowed { + firstDefinedOption := options[0] + errs = append(errs, common.LSPError{ + Range: option.Key.LocationRange, + Err: errors.New(fmt.Sprintf( + "Option '%s' has already been defined on line %d", + option.Key.Key, + firstDefinedOption.Start.Line+1, + )), + }) + } else { + i.AllOptionsPerName[option.Key.Key][block] = append( + i.AllOptionsPerName[option.Key.Key][block], + option, + ) + } + } else { + i.AllOptionsPerName[option.Key.Key][block] = []*ast.SSHOption{ + option, + } + } + } else { + i.AllOptionsPerName[option.Key.Key] = map[*ast.SSHBlock]([]*ast.SSHOption){ + block: { + option, + }, + } + } + + return errs +} diff --git a/handlers/ssh_config/ast/indexes.go b/handlers/ssh_config/indexes/indexes.go similarity index 65% rename from handlers/ssh_config/ast/indexes.go rename to handlers/ssh_config/indexes/indexes.go index 109be56..35cc82d 100644 --- a/handlers/ssh_config/ast/indexes.go +++ b/handlers/ssh_config/indexes/indexes.go @@ -1,6 +1,9 @@ -package ast +package indexes -import "config-lsp/common" +import ( + "config-lsp/common" + "config-lsp/handlers/ssh_config/ast" +) type ValidPath string @@ -19,17 +22,13 @@ type SSHIndexIncludeValue struct { type SSHIndexIncludeLine struct { Values []*SSHIndexIncludeValue - Option *SSHOption - Block *SSHBlock + Option *ast.SSHOption + Block *ast.SSHBlock } type SSHIndexes struct { + AllOptionsPerName map[string](map[*ast.SSHBlock]([]*ast.SSHOption)) + Includes []*SSHIndexIncludeLine } -func NewSSHIndexes() *SSHIndexes { - return &SSHIndexes{ - Includes: make([]*SSHIndexIncludeLine, 0), - } -} - diff --git a/handlers/ssh_config/indexes/indexes_test.go b/handlers/ssh_config/indexes/indexes_test.go new file mode 100644 index 0000000..73a6abe --- /dev/null +++ b/handlers/ssh_config/indexes/indexes_test.go @@ -0,0 +1,53 @@ +package indexes + +import ( + // "config-lsp/handlers/sshd_config/ast" + // "config-lsp/utils" + // "testing" +) + +// func TestComplexExample( +// t *testing.T, +// ) { +// input := utils.Dedent(` +// IdentityFile ~/.ssh/id_rsa +// +// Host server1 +// HostName server1.cyberciti.biz +// User nixcraft +// Port 4242 +// IdentityFile /nfs/shared/users/nixcraft/keys/server1/id_rsa +// +// ## Home nas server ## +// Host nas01 +// HostName 192.168.1.100 +// User root +// IdentityFile ~/.ssh/nas01.key +// `) +// config := ast.NewSSHDConfig() +// errors := config.Parse(input) +// +// if len(errors) > 0 { +// t.Fatalf("Expected no errors, but got %v", len(errors)) +// } +// +// indexes, errors := CreateIndexes(*config) +// +// if !(len(errors) == 1) { +// t.Fatalf("Expected one errors, but got %v", len(errors)) +// } +// +// firstMatchBlock := config.FindMatchBlock(uint32(6)) +// opts := indexes.AllOptionsPerName["PermitRootLogin"] +// if !(len(opts) == 2 && +// len(opts[nil]) == 1 && +// opts[nil][0].Value.Value == "PermitRootLogin yes" && +// opts[nil][0].Start.Line == 0 && +// len(opts[firstMatchBlock]) == 1 && +// opts[firstMatchBlock][0].Value.Value == "\tPermitRootLogin no" && +// opts[firstMatchBlock][0].Start.Line == 6 && +// opts[firstMatchBlock][0].Key.Key == "PermitRootLogin") { +// t.Errorf("Expected 3 PermitRootLogin options, but got %v", opts) +// } +// } + diff --git a/handlers/ssh_config/shared.go b/handlers/ssh_config/shared.go index f701d68..5aa8e06 100644 --- a/handlers/ssh_config/shared.go +++ b/handlers/ssh_config/shared.go @@ -2,13 +2,14 @@ package sshconfig import ( "config-lsp/handlers/ssh_config/ast" + "config-lsp/handlers/ssh_config/indexes" protocol "github.com/tliron/glsp/protocol_3_16" ) type SSHDocument struct { Config *ast.SSHConfig - Indexes *ast.SSHIndexes + Indexes *indexes.SSHIndexes } var DocumentParserMap = map[protocol.DocumentUri]*SSHDocument{} diff --git a/handlers/sshd_config/fields/fields.go b/handlers/sshd_config/fields/fields.go index 09f9536..45e4ebb 100644 --- a/handlers/sshd_config/fields/fields.go +++ b/handlers/sshd_config/fields/fields.go @@ -1,6 +1,7 @@ package fields import ( + "config-lsp/common/ssh" docvalues "config-lsp/doc-values" "regexp" ) @@ -220,7 +221,7 @@ See PATTERNS in ssh_config(5) for more information on patterns. This keyword may docvalues.CreateEnumString("x11-connection"), }, }, - Value: TimeFormatValue{}, + Value: docvalues.TimeFormatValue{}, }, }, }, @@ -325,11 +326,11 @@ See PATTERNS in ssh_config(5) for more information on patterns. This keyword may The list of available signature algorithms may also be obtained using "ssh -Q HostbasedAcceptedAlgorithms". This was formerly named HostbasedAcceptedKeyTypes.`, Value: docvalues.CustomValue{ FetchValue: func(_ docvalues.CustomValueContext) docvalues.Value { - options, err := queryOpenSSHOptions("HostbasedAcceptedAlgorithms") + options, err := ssh.QueryOpenSSHOptions("HostbasedAcceptedAlgorithms") if err != nil { // Fallback - options, _ = queryOpenSSHOptions("HostbasedAcceptedKeyTypes") + options, _ = ssh.QueryOpenSSHOptions("HostbasedAcceptedKeyTypes") } return prefixPlusMinusCaret(options) @@ -374,7 +375,7 @@ See PATTERNS in ssh_config(5) for more information on patterns. This keyword may The list of available signature algorithms may also be obtained using "ssh -Q HostKeyAlgorithms".`, Value: docvalues.CustomValue{ FetchValue: func(_ docvalues.CustomValueContext) docvalues.Value { - options, _ := queryOpenSSHOptions("HostKeyAlgorithms") + options, _ := ssh.QueryOpenSSHOptions("HostKeyAlgorithms") return prefixPlusMinusCaret(options) }, @@ -513,7 +514,7 @@ See PATTERNS in ssh_config(5) for more information on patterns. This keyword may }, "LoginGraceTime": { Documentation: `The server disconnects after this time if the user has not successfully logged in. If the value is 0, there is no time limit. The default is 120 seconds.`, - Value: TimeFormatValue{}, + Value: docvalues.TimeFormatValue{}, }, "LogLevel": { Documentation: `Gives the verbosity level that is used when logging messages from sshd(8). The possible values are: QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is INFO. DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher levels of debugging output. Logging with a DEBUG level violates the privacy of users and is not recommended.`, @@ -790,7 +791,7 @@ Only a subset of keywords may be used on the lines following a Match keyword. Av The list of available signature algorithms may also be obtained using "ssh -Q PubkeyAcceptedAlgorithms".`, Value: docvalues.CustomValue{ FetchValue: func(_ docvalues.CustomValueContext) docvalues.Value { - options, _ := queryOpenSSHOptions("PubkeyAcceptedAlgorithms") + options, _ := ssh.QueryOpenSSHOptions("PubkeyAcceptedAlgorithms") return prefixPlusMinusCaret(options) }, @@ -822,8 +823,8 @@ Only a subset of keywords may be used on the lines following a Match keyword. Av Value: docvalues.KeyValueAssignmentValue{ Separator: " ", ValueIsOptional: true, - Key: DataAmountValue{}, - Value: TimeFormatValue{}, + Key: docvalues.DataAmountValue{}, + Value: docvalues.TimeFormatValue{}, }, }, "RequiredRSASize": { @@ -925,7 +926,7 @@ Only a subset of keywords may be used on the lines following a Match keyword. Av Documentation: `Specifies whether and how quickly sshd(8) should close client connections with no open channels. Open channels include active shell, command execution or subsystem sessions, connected network, socket, agent or X11 forwardings. Forwarding listeners, such as those from the ssh(1) -R flag, are not considered as open channels and do not prevent the timeout. The timeout value is specified in seconds or may use any of the units documented in the “TIME FORMATS” section. Note that this timeout starts when the client connection completes user authentication but before the client has an opportunity to open any channels. Caution should be used when using short timeout values, as they may not provide sufficient time for the client to request and open its channels before terminating the connection. The default none is to never expire connections for having no open channels. This option may be useful in conjunction with ChannelTimeout.`, - Value: TimeFormatValue{}, + Value: docvalues.TimeFormatValue{}, }, "UseDNS": { Documentation: `Specifies whether sshd(8) should look up the remote host name, and to check that the resolved host name for the remote IP address maps back to the very same IP address. diff --git a/handlers/sshd_config/fields/utils.go b/handlers/sshd_config/fields/utils.go index eb092d0..a9c8189 100644 --- a/handlers/sshd_config/fields/utils.go +++ b/handlers/sshd_config/fields/utils.go @@ -2,14 +2,8 @@ package fields import ( docvalues "config-lsp/doc-values" - "config-lsp/utils" - "os/exec" - "regexp" - "strings" ) -var isJustDigitsPattern = regexp.MustCompile(`^\d+$`) - var booleanEnumValue = docvalues.EnumValue{ EnforceValues: true, Values: []docvalues.EnumString{ @@ -18,21 +12,6 @@ var booleanEnumValue = docvalues.EnumValue{ }, } -var plusMinuxCaretPrefixes = []docvalues.Prefix{ - { - Prefix: "+", - Meaning: "Append to the default set", - }, - { - Prefix: "-", - Meaning: "Remove from the default set", - }, - { - Prefix: "^", - Meaning: "Place at the head of the default set", - }, -} - var channelTimeoutExtractor = docvalues.ExtractKeyDuplicatesExtractor("=") var setEnvExtractor = docvalues.ExtractKeyDuplicatesExtractor("=") @@ -61,39 +40,3 @@ func prefixPlusMinusCaret(values []docvalues.EnumString) docvalues.PrefixWithMea }, } } - -var _cachedQueries map[string][]docvalues.EnumString = make(map[string][]docvalues.EnumString) - -func queryValues(query string) ([]string, error) { - cmd := exec.Command("ssh", "-Q", query) - - output, err := cmd.Output() - - if err != nil { - return []string{}, err - } - - return strings.Split(string(output), "\n"), nil -} - -func queryOpenSSHOptions( - query string, -) ([]docvalues.EnumString, error) { - var availableQueries []docvalues.EnumString - key := query - - if _cachedQueries[key] != nil && len(_cachedQueries[key]) > 0 { - return _cachedQueries[key], nil - } else { - availableRawQueries, err := queryValues(query) - availableQueries = utils.Map(availableRawQueries, docvalues.CreateEnumString) - - if err != nil { - return []docvalues.EnumString{}, err - } - - _cachedQueries[key] = availableQueries - } - - return availableQueries, nil -}