Myzel394/config-lsp
1
0
Fork 0
mirror of https://github.com/Myzel394/config-lsp.git synced 2025-06-18 23:15:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): Improve structure analyzer for sshd_config

Browse Source 
Signed-off-by: Myzel394 <github.7a2op@simplelogin.co>
This commit is contained in:
Myzel394 2025-02-17 22:41:06 +01:00 committed by Myzel394
parent 98f76fd839
commit bf05d07fc9
No known key found for this signature in database
GPG Key ID: B603E877F73D4ABB
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
server/handlers/sshd_config/analyzer/options.go
View File

@ -6,6 +6,7 @@ import (
"config-lsp/handlers/sshd_config/ast" "config-lsp/handlers/sshd_config/ast"
"config-lsp/handlers/sshd_config/diagnostics" "config-lsp/handlers/sshd_config/diagnostics"
"config-lsp/handlers/sshd_config/fields" "config-lsp/handlers/sshd_config/fields"
"config-lsp/utils"
"fmt" "fmt"
protocol "github.com/tliron/glsp/protocol_3_16" protocol "github.com/tliron/glsp/protocol_3_16"
@ -38,13 +39,25 @@ func checkOption(
return return
} }
///// General checks
checkIsUsingDoubleQuotes(ctx, option.Key.Value, option.Key.LocationRange) checkIsUsingDoubleQuotes(ctx, option.Key.Value, option.Key.LocationRange)
checkQuotesAreClosed(ctx, option.Key.Value, option.Key.LocationRange) checkQuotesAreClosed(ctx, option.Key.Value, option.Key.LocationRange)
key := option.Key.Key if option.Separator == nil || option.Separator.Value.Value == "" {
docOption, found := fields.Options[key] ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
Range: option.Key.LocationRange.ToLSPRange(),
Message: fmt.Sprintf("There should be a separator between an option and its value"),
Severity: &common.SeverityError,
})
} else {
checkIsUsingDoubleQuotes(ctx, option.Separator.Value, option.Separator.LocationRange)
checkQuotesAreClosed(ctx, option.Separator.Value, option.Separator.LocationRange)
}
if !found { ///// Check if the key is valid
docOption, optionFound := fields.Options[option.Key.Key]
if !optionFound {
ctx.diagnostics = append(ctx.diagnostics, diagnostics.GenerateUnknownOption( ctx.diagnostics = append(ctx.diagnostics, diagnostics.GenerateUnknownOption(
option.Key.ToLSPRange(), option.Key.ToLSPRange(),
option.Key.Value.Value, option.Key.Value.Value,
@ -54,17 +67,20 @@ func checkOption(
MatchBlock: matchBlock, MatchBlock: matchBlock,
} }
// Since we don't know the option, we can't verify the value
return return
} else {
// Check for values that are not allowed in Match blocks
if matchBlock != nil && !utils.KeyExists(fields.MatchAllowedOptions, option.Key.Key) {
ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
Range: option.Key.ToLSPRange(),
Message: fmt.Sprintf("Option '%s' is not allowed in Match blocks", option.Key.Key),
Severity: &common.SeverityError,
})
}
} }
if _, found := fields.MatchAllowedOptions[key]; !found && matchBlock != nil { ///// Check if the value is valid
ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
Range: option.Key.ToLSPRange(),
Message: fmt.Sprintf("Option '%s' is not allowed inside Match blocks", option.Key.Key),
Severity: &common.SeverityError,
})
}
if option.OptionValue != nil { if option.OptionValue != nil {
checkIsUsingDoubleQuotes(ctx, option.OptionValue.Value, option.OptionValue.LocationRange) checkIsUsingDoubleQuotes(ctx, option.OptionValue.Value, option.OptionValue.LocationRange)
checkQuotesAreClosed(ctx, option.OptionValue.Value, option.OptionValue.LocationRange) checkQuotesAreClosed(ctx, option.OptionValue.Value, option.OptionValue.LocationRange)
@ -82,16 +98,6 @@ func checkOption(
} }
} }
if option.Separator == nil || option.Separator.Value.Value == "" {
ctx.diagnostics = append(ctx.diagnostics, protocol.Diagnostic{
Range: option.Key.LocationRange.ToLSPRange(),
Message: fmt.Sprintf("There should be a separator between an option and its value"),
Severity: &common.SeverityError,
})
} else {
checkIsUsingDoubleQuotes(ctx, option.Separator.Value, option.Separator.LocationRange)
checkQuotesAreClosed(ctx, option.Separator.Value, option.Separator.LocationRange)
}
} }
func checkMatchBlock( func checkMatchBlock(