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(sshd_config): Use normalized option keys

Browse Source
This commit is contained in:
Myzel394 2024-10-16 09:30:33 +02:00
parent b9b932d0f2
commit c3d1ec3b0f
No known key found for this signature in database
GPG Key ID: ED20A1D1D423AF3F
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/handlers/sshd_config/analyzer/match.go
View File

@ -12,10 +12,12 @@ import (
protocol "github.com/tliron/glsp/protocol_3_16" protocol "github.com/tliron/glsp/protocol_3_16"
) )
var matchOption = fields.CreateNormalizedName("Match")
func analyzeMatchBlocks( func analyzeMatchBlocks(
ctx *analyzerContext, ctx *analyzerContext,
) { ) {
for matchBlock, options := range ctx.document.Indexes.AllOptionsPerName["Match"] { for matchBlock, options := range ctx.document.Indexes.AllOptionsPerName[matchOption] {
option := options[0] option := options[0]
// Check if the match block has filled out all fields // Check if the match block has filled out all fields
if matchBlock == nil || matchBlock.MatchValue == nil || len(matchBlock.MatchValue.Entries) == 0 { if matchBlock == nil || matchBlock.MatchValue == nil || len(matchBlock.MatchValue.Entries) == 0 {

2
server/handlers/sshd_config/ast/parser_test.go
View File

@ -234,7 +234,7 @@ Match Address 192.168.0.2
} }
firstOption, firstMatchBlock := p.FindOption(uint32(3)) firstOption, firstMatchBlock := p.FindOption(uint32(3))
if !(firstOption.Key.Key == "PasswordAuthentication" && firstOption.OptionValue.Value.Value == "yes") { if !(firstOption.Key.Key == "passwordauthentication" && firstOption.OptionValue.Value.Value == "yes") {
t.Errorf("Expected first option to be 'PasswordAuthentication yes' and first match block to be 'Match Address 192.168.0.1', but got: %v, %v", firstOption, firstMatchBlock) t.Errorf("Expected first option to be 'PasswordAuthentication yes' and first match block to be 'Match Address 192.168.0.1', but got: %v, %v", firstOption, firstMatchBlock)
} }

4
server/handlers/sshd_config/indexes/indexes_handlers.go
View File

@ -11,6 +11,8 @@ import (
var whitespacePattern = regexp.MustCompile(`\S+`) var whitespacePattern = regexp.MustCompile(`\S+`)
var includeOption = fields.CreateNormalizedName("Include")
func CreateIndexes(config ast.SSHDConfig) (*SSHDIndexes, []common.LSPError) { func CreateIndexes(config ast.SSHDConfig) (*SSHDIndexes, []common.LSPError) {
errs := make([]common.LSPError, 0) errs := make([]common.LSPError, 0)
indexes := &SSHDIndexes{ indexes := &SSHDIndexes{
@ -42,7 +44,7 @@ func CreateIndexes(config ast.SSHDConfig) (*SSHDIndexes, []common.LSPError) {
} }
// Add Includes // Add Includes
for matchBlock, options := range indexes.AllOptionsPerName["Include"] { for matchBlock, options := range indexes.AllOptionsPerName[includeOption] {
includeOption := options[0] includeOption := options[0]
rawValue := includeOption.OptionValue.Value.Value rawValue := includeOption.OptionValue.Value.Value
pathIndexes := whitespacePattern.FindAllStringIndex(rawValue, -1) pathIndexes := whitespacePattern.FindAllStringIndex(rawValue, -1)

4
server/handlers/sshd_config/indexes/indexes_test.go
View File

@ -34,7 +34,7 @@ Match Address 192.168.0.1/24
} }
firstMatchBlock := config.FindMatchBlock(uint32(6)) firstMatchBlock := config.FindMatchBlock(uint32(6))
opts := indexes.AllOptionsPerName["PermitRootLogin"] opts := indexes.AllOptionsPerName["permitrootlogin"]
if !(len(opts) == 2 && if !(len(opts) == 2 &&
len(opts[nil]) == 1 && len(opts[nil]) == 1 &&
opts[nil][0].Value.Value == "PermitRootLogin yes" && opts[nil][0].Value.Value == "PermitRootLogin yes" &&
@ -42,7 +42,7 @@ Match Address 192.168.0.1/24
len(opts[firstMatchBlock]) == 1 && len(opts[firstMatchBlock]) == 1 &&
opts[firstMatchBlock][0].Value.Value == "\tPermitRootLogin no" && opts[firstMatchBlock][0].Value.Value == "\tPermitRootLogin no" &&
opts[firstMatchBlock][0].Start.Line == 6 && opts[firstMatchBlock][0].Start.Line == 6 &&
opts[firstMatchBlock][0].Key.Key == "PermitRootLogin") { opts[firstMatchBlock][0].Key.Key == "permitrootlogin") {
t.Errorf("Expected 3 PermitRootLogin options, but got %v", opts) t.Errorf("Expected 3 PermitRootLogin options, but got %v", opts)
} }
} }