MEDIUM: add missing global keywords

Author: gorangalinec

parsers/unix-bind.go

@@ -0,0 +1,104 @@
+/*
+Copyright 2019 HAProxy Technologies
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package parsers
+
+import (
+	"io"
+	"strings"
+
+	"github.com/haproxytech/config-parser/v4/common"
+	"github.com/haproxytech/config-parser/v4/errors"
+	"github.com/haproxytech/config-parser/v4/types"
+)
+
+type UnixBind struct {
+	data        *types.UnixBind
+	preComments []string // comments that appear before the the actual line
+}
+
+func (p *UnixBind) Parse(line string, parts []string, comment string) (changeState string, err error) {
+	if len(parts) < 3 {
+		return "", &errors.ParseError{Parser: "UnixBind", Line: line}
+	}
+	if parts[0] != "unix-bind" {
+		return "", &errors.ParseError{Parser: "UnixBind", Line: line}
+	}
+
+	data := &types.UnixBind{}
+
+	for i := 1; i < len(parts); i++ {
+		element := parts[i]
+		switch element {
+		case "prefix":
+			CheckParsePair(parts, &i, &data.Prefix)
+		case "mode":
+			CheckParsePair(parts, &i, &data.Mode)
+		case "user":
+			CheckParsePair(parts, &i, &data.User)
+		case "uid":
+			CheckParsePair(parts, &i, &data.UID)
+		case "group":
+			CheckParsePair(parts, &i, &data.Group)
+		case "gid":
+			CheckParsePair(parts, &i, &data.GID)
+		}
+	}
+	p.data = data
+	return "", nil
+}
+
+func (p *UnixBind) Result() ([]common.ReturnResultLine, error) {
+	if p.data == nil {
+		return nil, errors.ErrFetch
+	}
+
+	sb := &strings.Builder{}
+
+	sb.WriteString("unix-bind")
+
+	CheckWritePair(sb, "prefix", p.data.Prefix)
+	CheckWritePair(sb, "mode", p.data.Mode)
+	CheckWritePair(sb, "user", p.data.User)
+	CheckWritePair(sb, "uid", p.data.UID)
+	CheckWritePair(sb, "group", p.data.Group)
+	CheckWritePair(sb, "gid", p.data.GID)
+
+	return []common.ReturnResultLine{
+		{
+			Data:    sb.String(),
+			Comment: p.data.Comment,
+		},
+	}, nil
+}
+
+func CheckParsePair(parts []string, i *int, str *string) {
+	if (*i + 1) < len(parts) {
+		*str = parts[*i+1]
+		*i++
+	}
+}
+
+func CheckWritePair(sb io.StringWriter, key string, value string) {
+	if value != "" {
+		_, _ = sb.WriteString(" ")
+		if key != "" {
+			_, _ = sb.WriteString(key)
+			_, _ = sb.WriteString(" ")
+		}
+		_, _ = sb.WriteString(value)
+	}
+}

parsers/unix-bind_generated.go

@@ -249,9 +249,12 @@ func (p *configParser) getGlobalParser() *Parsers {
 	addParser(parser, &sequence, &simple.String{Name: "ssl-default-server-options"})
 	addParser(parser, &sequence, &simple.Word{Name: "ssl-default-server-ciphers"})
 	addParser(parser, &sequence, &simple.Word{Name: "ssl-default-server-ciphersuites"})
+	addParser(parser, &sequence, &simple.Word{Name: "ssl-default-bind-curves"})
+	// ssl-default-bind-options TODO
 	addParser(parser, &sequence, &simple.Word{Name: "ssl-dh-param-file"})
 	addParser(parser, &sequence, &simple.Enabled{Name: "ssl-load-extra-del-ext"})
 	addParser(parser, &sequence, &simple.Word{Name: "ssl-server-verify"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "ssl-skip-self-issued-ca"})
 	addParser(parser, &sequence, &simple.Time{Name: "hard-stop-after"})
 	addParser(parser, &sequence, &parsers.Log{})
 	addParser(parser, &sequence, &parsers.LogSendHostName{})
@@ -274,6 +277,29 @@ func (p *configParser) getGlobalParser() *Parsers {
 	addParser(parser, &sequence, &simple.Enabled{Name: "noreuseport"})
 	addParser(parser, &sequence, &simple.AutoOnOff{Name: "profiling.tasks"})
 	addParser(parser, &sequence, &simple.Number{Name: "spread-checks"})
+	addParser(parser, &sequence, &simple.String{Name: "wurfl-data-file"})
+	addParser(parser, &sequence, &simple.String{Name: "wurfl-information-list"})
+	addParser(parser, &sequence, &simple.String{Name: "wurfl-information-list-separator"})
+	addParser(parser, &sequence, &simple.String{Name: "wurfl-patch-file"})
+	addParser(parser, &sequence, &simple.Number{Name: "wurfl-cache-size"})
+	addParser(parser, &sequence, &simple.String{Name: "default-path"})
+	addParser(parser, &sequence, &simple.String{Name: "description"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "expose-experimental-directives"})
+	addParser(parser, &sequence, &simple.String{Name: "grace"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "insecure-fork-wanted"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "insecure-setuid-wanted"})
+	addParser(parser, &sequence, &simple.String{Name: "issuers-chain-path"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "h2-workaround-bogus-websocket-clients"})
+	addParser(parser, &sequence, &simple.String{Name: "lua-load-per-thread"})
+	addParser(parser, &sequence, &simple.Number{Name: "mworker-max-reloads"})
+	addParser(parser, &sequence, &simple.String{Name: "node"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "numa-cpu-mapping"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "pp2-never-send-local"})
+	addParser(parser, &sequence, &simple.Number{Name: "ulimit-n"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "set-dumpable"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "strict-limits"})
+	addParser(parser, &sequence, &parsers.UnixBind{})
+	// set-var TODO
 	// the ConfigSnippet must be at the end to parsers load order to ensure
 	// the overloading of any option has been declared previously
 	addParser(parser, &sequence, &parsers.ConfigSnippet{})

section-parsers.go

@@ -1116,3 +1116,23 @@ type ForcePersist struct {
 	CondTest string
 	Comment  string
 }
+
+//sections:global
+//name:unix-bind
+//is-multiple:false
+//test:ok:unix-bind prefix pre
+//test:ok:unix-bind prefix pre mode test
+//test:ok:unix-bind prefix pre mode test user ggalinec
+//test:ok:unix-bind prefix pre mode test user ggalinec uid 12345
+//test:ok:unix-bind prefix pre mode test user ggalinec uid 12345 group haproxy
+//test:ok:unix-bind prefix pre mode test user ggalinec uid 12345 group haproxy gid 6789
+//test:fail:unix-bind
+type UnixBind struct {
+	Prefix  string
+	Mode    string
+	User    string
+	UID     string
+	Group   string
+	GID     string
+	Comment string
+}