Preserve allow.list ordering on save

serv/allow.go

@@ -26,7 +26,8 @@ type allowItem struct {
 var _allowList allowList
 
 type allowList struct {
-	list     map[string]*allowItem
+	list     []*allowItem
+	index    map[string]int
 	filepath string
 	saveChan chan *allowItem
 	active   bool
@@ -34,7 +35,7 @@ type allowList struct {
 
 func initAllowList(cpath string) {
 	_allowList = allowList{
-		list:     make(map[string]*allowItem),
+		index:    make(map[string]int),
 		saveChan: make(chan *allowItem),
 		active:   true,
 	}
@@ -172,19 +173,21 @@ func (al *allowList) load() {
 			if c == 0 {
 				if ty == AL_QUERY {
 					q := string(b[s:(e + 1)])
+					key := gqlHash(q, varBytes, "")
 
-					item := &allowItem{
-						uri: uri,
-						gql: q,
-					}
-
-					if len(varBytes) != 0 {
+					if idx, ok := al.index[key]; !ok {
+						al.list = append(al.list, &allowItem{
+							uri:  uri,
+							gql:  q,
+							vars: varBytes,
+						})
+						al.index[key] = len(al.list) - 1
+					} else {
+						item := al.list[idx]
+						item.gql = q
 						item.vars = varBytes
 					}
 
-					//fmt.Println("%%", item.gql, string(item.vars))
-
-					al.list[gqlHash(q, varBytes, "")] = item
 					varBytes = nil
 
 				} else if ty == AL_VARS {
@@ -205,11 +208,15 @@ func (al *allowList) save(item *allowItem) {
 	if al.active == false {
 		return
 	}
-	h := gqlHash(item.gql, item.vars, "")
-	if _, ok := al.list[h]; ok {
-		return
+
+	key := gqlHash(item.gql, item.vars, "")
+
+	if idx, ok := al.index[key]; ok {
+		al.list[idx] = item
+	} else {
+		al.list = append(al.list, item)
+		al.index[key] = len(al.list) - 1
 	}
-	al.list[gqlHash(item.gql, item.vars, "")] = item
 
 	f, err := os.Create(al.filepath)
 	if err != nil {

serv/config.go

@@ -65,7 +65,7 @@ type config struct {
 		Vars map[string]string `mapstructure:"variables"`
 
 		Defaults struct {
-			Filter    []string
+			Filters   []string
 			Blocklist []string
 		}
 
@@ -106,28 +106,28 @@ type configRole struct {
 
 		Query struct {
 			Limit              int
-			Filter             []string
+			Filters            []string
 			Columns            []string
 			DisableAggregation bool `mapstructure:"disable_aggregation"`
 			Deny               bool
 		}
 
 		Insert struct {
-			Filter  []string
+			Filters []string
 			Columns []string
 			Set     map[string]string
 			Deny    bool
 		}
 
 		Update struct {
-			Filter  []string
+			Filters []string
 			Columns []string
 			Set     map[string]string
 			Deny    bool
 		}
 
 		Delete struct {
-			Filter  []string
+			Filters []string
 			Columns []string
 			Deny    bool
 		}

serv/serv.go

@@ -34,25 +34,25 @@ func initCompilers(c *config) (*qcode.Compiler, *psql.Compiler, error) {
 		for _, t := range r.Tables {
 			query := qcode.QueryConfig{
 				Limit:            t.Query.Limit,
-				Filter:           t.Query.Filter,
+				Filters:          t.Query.Filters,
 				Columns:          t.Query.Columns,
 				DisableFunctions: t.Query.DisableAggregation,
 			}
 
 			insert := qcode.InsertConfig{
-				Filter:  t.Insert.Filter,
+				Filters: t.Insert.Filters,
 				Columns: t.Insert.Columns,
 				Set:     t.Insert.Set,
 			}
 
 			update := qcode.UpdateConfig{
-				Filter:  t.Insert.Filter,
+				Filters: t.Insert.Filters,
 				Columns: t.Insert.Columns,
 				Set:     t.Insert.Set,
 			}
 
 			delete := qcode.DeleteConfig{
-				Filter:  t.Insert.Filter,
+				Filters: t.Insert.Filters,
 				Columns: t.Insert.Columns,
 			}