fix: enable unused and forcetypeassert rules and start fixing war…

…nings
SpecterOps · Jan 31, 2024 · 322dca4 · 322dca4
1 parent fee4256
commit 322dca4
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 81 deletions.
diff --git a/.golangci.json b/.golangci.json
@@ -1,12 +1,12 @@
 {
   "linters": {
     "disable": [
-      "errcheck",
-      "unused"
+      "errcheck"
     ],
     "enable": [
       "gosimple",
-      "stylecheck"
+      "stylecheck",
+      "forcetypeassert"
     ]
   },
   "issues": {
@@ -26,6 +26,10 @@
         "path": "foldr_test\\.go",
         "text": "SA4000:",
         "severity": "warning"
+      },
+      {
+        "path": "(dawgs/util/size/(.+)|dawgs/drivers/pg/statements.go)",
+        "linters": ["unused"]
       }
     ]
   },
@@ -41,6 +45,10 @@
   "severity": {
     "default-severity": "error",
     "rules": [
+      {
+        "linters": ["unused"],
+        "severity": "warning"
+      },
       {
         "text": "(ST\\d{4}|S\\d{4}|SA1019)",
         "severity": "warning"

diff --git a/packages/go/crypto/argon2.go b/packages/go/crypto/argon2.go
@@ -1,17 +1,17 @@
 // Copyright 2023 Specter Ops, Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0
 // 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.
-// 
+//
 // SPDX-License-Identifier: Apache-2.0
 
 package crypto
@@ -78,7 +78,6 @@ type ComputerSpecs struct {
 
 // Argon2 is a frontend implementation for the recommendations specified in https://tools.ietf.org/html/draft-irtf-cfrg-argon2-04
 type Argon2 struct {
-	mcFormatRegex   *regexp.Regexp
 	MemoryKibibytes uint32
 	NumIterations   uint32
 	NumThreads      uint8

diff --git a/packages/go/cypher/frontend/literal.go b/packages/go/cypher/frontend/literal.go
@@ -1,17 +1,17 @@
 // Copyright 2023 Specter Ops, Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0
 // 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.
-// 
+//
 // SPDX-License-Identifier: Apache-2.0
 
 package frontend
@@ -109,8 +109,7 @@ func (s *ListLiteralVisitor) ExitOC_Expression(ctx *parser.OC_ExpressionContext)
 type LiteralVisitor struct {
 	BaseVisitor
 
-	Literal     *model.Literal
-	propertyKey string
+	Literal *model.Literal
 }
 
 func NewLiteralVisitor() *LiteralVisitor {

diff --git a/packages/go/cypher/model/model.go b/packages/go/cypher/model/model.go
@@ -17,9 +17,10 @@
 package model
 
 import (
-	"github.com/specterops/bloodhound/dawgs/graph"
 	"sort"
 	"strings"
+
+	"github.com/specterops/bloodhound/dawgs/graph"
 )
 
 type SortOrder string
@@ -1089,17 +1090,6 @@ func NewProperties() *Properties {
 	return &Properties{}
 }
 
-func (s *Properties) copy() *Properties {
-	if s == nil {
-		return nil
-	}
-
-	return &Properties{
-		Map:       Copy(s.Map),
-		Parameter: Copy(s.Parameter),
-	}
-}
-
 // NodePattern Type
 //
 // Kinds is a conjunction of types for the given node.

diff --git a/packages/go/dawgs/drivers/pg/manager.go b/packages/go/dawgs/drivers/pg/manager.go
@@ -18,11 +18,12 @@ package pg
 
 import (
 	"errors"
+	"sync"
+
 	"github.com/jackc/pgx/v5"
 	"github.com/specterops/bloodhound/dawgs/drivers/pg/model"
 	"github.com/specterops/bloodhound/dawgs/drivers/pg/query"
 	"github.com/specterops/bloodhound/dawgs/graph"
-	"sync"
 )
 
 type KindMapper interface {
@@ -79,25 +80,6 @@ func (s *SchemaManager) defineKinds(tx graph.Transaction, kinds graph.Kinds) err
 	return nil
 }
 
-func (s *SchemaManager) defineGraphKinds(tx graph.Transaction, schemas []graph.Graph) error {
-	for _, schema := range schemas {
-		var (
-			_, missingNodeKinds = s.mapKinds(schema.Nodes)
-			_, missingEdgeKinds = s.mapKinds(schema.Edges)
-		)
-
-		if err := s.defineKinds(tx, missingNodeKinds); err != nil {
-			return err
-		}
-
-		if err := s.defineKinds(tx, missingEdgeKinds); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (s *SchemaManager) mapKinds(kinds graph.Kinds) ([]int16, graph.Kinds) {
 	var (
 		missingKinds = make(graph.Kinds, 0, len(kinds))

diff --git a/packages/go/dawgs/drivers/pg/query/format.go b/packages/go/dawgs/drivers/pg/query/format.go
@@ -18,11 +18,12 @@ package query
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/specterops/bloodhound/dawgs/drivers/pg/model"
 	"github.com/specterops/bloodhound/dawgs/graph"
 	"github.com/specterops/bloodhound/graphschema/ad"
-	"strconv"
-	"strings"
 )
 
 func postgresIndexType(indexType graph.IndexType) string {
@@ -117,23 +118,6 @@ func formatConflictMatcher(propertyNames []string, defaultOnConflict string) str
 	return builder.String()
 }
 
-type idCounter struct {
-	current int
-}
-
-func newIDCounter() *idCounter {
-	return &idCounter{
-		current: 1,
-	}
-}
-
-func (s *idCounter) Next() string {
-	next := s.current
-	s.current += 1
-
-	return strconv.Itoa(next)
-}
-
 func FormatNodeUpsert(graphTarget model.Graph, identityProperties []string) string {
 	return join(
 		"insert into ", graphTarget.Partitions.Node.Name, " as n ",

diff --git a/packages/go/dawgs/drivers/pg/transaction.go b/packages/go/dawgs/drivers/pg/transaction.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -56,12 +57,6 @@ func (s inspectingDriver) QueryRow(ctx context.Context, sql string, arguments ..
 	return s.upstreamDriver.QueryRow(ctx, sql, arguments...)
 }
 
-func newInspectingDriver(upstreamDriver driver) driver {
-	return &inspectingDriver{
-		upstreamDriver: upstreamDriver,
-	}
-}
-
 type transaction struct {
 	schemaManager      *SchemaManager
 	queryExecMode      pgx.QueryExecMode

diff --git a/packages/go/dawgs/query/neo4j/neo4j.go b/packages/go/dawgs/query/neo4j/neo4j.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+
 	"github.com/specterops/bloodhound/cypher/backend/cypher"
 	"github.com/specterops/bloodhound/cypher/model"
 	"github.com/specterops/bloodhound/dawgs/graph"
@@ -33,10 +34,9 @@ var (
 type QueryBuilder struct {
 	Parameters map[string]any
 
-	query                    *model.RegularQuery
-	order                    *model.Order
-	relationshipPatternKinds graph.Kinds
-	prepared                 bool
+	query    *model.RegularQuery
+	order    *model.Order
+	prepared bool
 }
 
 func NewQueryBuilder(singleQuery *model.RegularQuery) *QueryBuilder {

diff --git a/packages/go/dawgs/traversal/traversal.go b/packages/go/dawgs/traversal/traversal.go
@@ -267,12 +267,6 @@ type Plan struct {
 	Driver      Driver
 }
 
-type Service struct {
-	db         graph.Database
-	workerWG   *sync.WaitGroup
-	numWorkers int
-}
-
 type Traversal struct {
 	db         graph.Database
 	numWorkers int