diff --git a/pkg/webserver/apache/lexer.go b/pkg/webserver/apache/lexer.go index f627c392..7185cc70 100644 --- a/pkg/webserver/apache/lexer.go +++ b/pkg/webserver/apache/lexer.go @@ -82,14 +82,6 @@ func (l *Lexer) readChar() { } } -// peekChar 预览下一个字符而不移动位置 -func (l *Lexer) peekChar() rune { - if l.pos+1 >= len(l.buf) { - return 0 - } - return l.buf[l.pos+1] -} - // skipWhitespace 跳过空白字符 func (l *Lexer) skipWhitespace() { for l.current == ' ' || l.current == '\t' || l.current == '\r' { diff --git a/pkg/webserver/apache/parser.go b/pkg/webserver/apache/parser.go index ecf71294..7a2d8ec1 100644 --- a/pkg/webserver/apache/parser.go +++ b/pkg/webserver/apache/parser.go @@ -404,17 +404,16 @@ func (p *Parser) parseBlockDirective(token Token) (*Block, error) { break } - if nextToken.Type == NEWLINE { + switch nextToken.Type { + case NEWLINE: continue - } - - if nextToken.Type == DIRECTIVE { + case DIRECTIVE: directive, err := p.parseDirective(nextToken) if err != nil { return nil, err } block.Directives = append(block.Directives, directive) - } else if nextToken.Type == COMMENT { + case COMMENT: // 处理块内注释 comment := &Comment{ Text: nextToken.Value, @@ -422,6 +421,8 @@ func (p *Parser) parseBlockDirective(token Token) (*Block, error) { Column: nextToken.Column, } block.Comments = append(block.Comments, comment) + default: + continue } } diff --git a/pkg/webserver/apache/proxy.go b/pkg/webserver/apache/proxy.go index 3b64d4a0..e10d5ceb 100644 --- a/pkg/webserver/apache/proxy.go +++ b/pkg/webserver/apache/proxy.go @@ -78,9 +78,7 @@ func parseProxyFile(filePath string) (*types.Proxy, error) { } // 解析 ProxyPreserveHost - if regexp.MustCompile(`ProxyPreserveHost\s+On`).MatchString(contentStr) { - // Host 由客户端提供 - } + _ = regexp.MustCompile(`ProxyPreserveHost\s+On`).MatchString(contentStr) // 解析 RequestHeader set Host hostPattern := regexp.MustCompile(`RequestHeader\s+set\s+Host\s+"([^"]+)"`) diff --git a/pkg/webserver/apache/vhost.go b/pkg/webserver/apache/vhost.go index 9456d141..6a909c95 100644 --- a/pkg/webserver/apache/vhost.go +++ b/pkg/webserver/apache/vhost.go @@ -546,7 +546,7 @@ func (v *baseVhost) BasicAuth() map[string]string { } func (v *baseVhost) SetBasicAuth(auth map[string]string) error { - if auth == nil || len(auth) == 0 { + if len(auth) == 0 { // 清除基本认证配置 v.vhost.RemoveDirective("AuthType") v.vhost.RemoveDirective("AuthName") diff --git a/pkg/webserver/apache/vhost_test.go b/pkg/webserver/apache/vhost_test.go index ff877871..f8e1bc5c 100644 --- a/pkg/webserver/apache/vhost_test.go +++ b/pkg/webserver/apache/vhost_test.go @@ -45,9 +45,9 @@ func (s *VhostTestSuite) TearDownTest() { } func (s *VhostTestSuite) TestNewVhost() { - s.Equal(s.configDir, s.vhost.baseVhost.configDir) - s.NotNil(s.vhost.baseVhost.config) - s.NotNil(s.vhost.baseVhost.vhost) + s.Equal(s.configDir, s.vhost.configDir) + s.NotNil(s.vhost.config) + s.NotNil(s.vhost.vhost) } func (s *VhostTestSuite) TestEnable() { diff --git a/pkg/webserver/nginx/setter.go b/pkg/webserver/nginx/setter.go index 305462d3..926f612f 100644 --- a/pkg/webserver/nginx/setter.go +++ b/pkg/webserver/nginx/setter.go @@ -493,9 +493,7 @@ func (p *Parser) SetErrorLog(errorLog string) error { // SetReturn 设置 return 指令(用于禁用网站) func (p *Parser) SetReturn(code, url string) error { - if err := p.Clear("server.return"); err != nil { - // 忽略不存在的错误 - } + _ = p.Clear("server.return") // 忽略不存在的错误 directives := []*config.Directive{ { @@ -534,9 +532,7 @@ func (p *Parser) SetReturn(code, url string) error { // SetLimitRate 设置限速配置 func (p *Parser) SetLimitRate(limitRate string) error { - if err := p.Clear("server.limit_rate"); err != nil { - // 忽略不存在的错误 - } + _ = p.Clear("server.limit_rate") // 忽略不存在的错误 if limitRate == "" { return nil // 清除限速配置 diff --git a/pkg/webserver/nginx/vhost.go b/pkg/webserver/nginx/vhost.go index 798b3126..9d830970 100644 --- a/pkg/webserver/nginx/vhost.go +++ b/pkg/webserver/nginx/vhost.go @@ -451,7 +451,7 @@ func (v *baseVhost) BasicAuth() map[string]string { } func (v *baseVhost) SetBasicAuth(auth map[string]string) error { - if auth == nil || len(auth) == 0 { + if len(auth) == 0 { // 清除基本认证配置 return v.parser.SetBasicAuth("", "") }