Merge pull request #3 from HilkopterBob/devel

Devel

.github/workflows/codeql.yml

@@ -0,0 +1,93 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: ["master", "devel"]
+  pull_request:
+    branches: ["master", "devel"]
+  schedule:
+    - cron: "21 14 * * 4"
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: go
+            build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -0,0 +1,39 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable
+# packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: "Dependency review"
+on:
+  pull_request:
+    branches: ["master", "devel"]
+
+# If using a dependency submission action in this workflow this permission will need to be set to:
+#
+# permissions:
+#   contents: write
+#
+# https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api
+permissions:
+  contents: read
+  # Write permissions for pull-requests are required for using the `comment-summary-in-pr` option, comment out if you aren't using this option
+  pull-requests: write
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout repository"
+        uses: actions/checkout@v4
+      - name: "Dependency Review"
+        uses: actions/dependency-review-action@v4
+        # Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
+        with:
+          comment-summary-in-pr: always
+          fail-on-severity: moderate
+        #   deny-licenses: GPL-1.0-or-later, LGPL-2.0-or-later
+        #   retry-on-snapshot-warnings: true

.github/workflows/golangci-lint.yml

@@ -0,0 +1,28 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+      - devel
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.59

.github/workflows/run-tests.yml

@@ -0,0 +1,17 @@
+name: run-tests
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22.6"
+      - name: Install dependencies
+        run: go get .
+      - name: Test with the Go CLI
+        run: go test

go.mod

@@ -4,13 +4,17 @@ go 1.22.6
 
 replace github.com/HilkopterBob/packagelock/controllers => ./controllers
 
-require github.com/gin-gonic/gin v1.10.0
+require (
+	github.com/gin-gonic/gin v1.10.0
+	github.com/stretchr/testify v1.9.0
+)
 
 require (
 	github.com/bytedance/sonic v1.12.1 // indirect
 	github.com/bytedance/sonic/loader v0.2.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
@@ -24,6 +28,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	golang.org/x/arch v0.9.0 // indirect

main.go

@@ -38,21 +38,21 @@ type Agent struct {
 	Agent_name   string
 	Agent_secret string
 	Host_ID      int
+	Agent_ID     int
 }
 
 var hosts = []Host{
 	{ID: 1, Name: "Host1", Network_info: Network_Info{Ip_addr: "192.168.1.1", Mac_addr: "AA:BB:CC:DD:EE:FF"}, Package_manager: Package_Manager{Package_manager_name: "pacman", Package_repos: []string{"Repo1", "Repo2", "Repo3"}}, Current_packages: []string{"Package1", "package2", "Package3"}},
 	{ID: 2, Name: "Host2", Network_info: Network_Info{Ip_addr: "192.168.1.2", Mac_addr: "AA:BB:CC:DD:EF:00"}, Package_manager: Package_Manager{Package_manager_name: "pacman", Package_repos: []string{"Repo1", "Repo2", "Repo3"}}, Current_packages: []string{"Package1", "package2", "Package3"}},
-	{ID: 3, Name: "Host3", Network_info: Network_Info{Ip_addr: "192.168.1.3", Mac_addr: "AA:BB:CC:DD:EF:01"}, Package_manager: Package_Manager{Package_manager_name: "pacman", Package_repos: []string{"Repo1", "Repo2", "Repo3"}}, Current_packages: []string{"Package1", "package2", "Package3"}},
+	{ID: 3, Name: "Ich liebe dich", Network_info: Network_Info{Ip_addr: "192.168.1.3", Mac_addr: "AA:BB:CC:DD:EF:01"}, Package_manager: Package_Manager{Package_manager_name: "pacman", Package_repos: []string{"Repo1", "Repo2", "Repo3"}}, Current_packages: []string{"Package1", "package2", "Package3"}},
 }
 
 var agents = []Agent{
-	{Agent_name: "Agent Host1", Agent_secret: "11:11:11:11", Host_ID: 1},
-	{Agent_name: "Agent Host2", Agent_secret: "11:11:11:12", Host_ID: 2},
-	{Agent_name: "Agent Host3", Agent_secret: "11:11:11:13", Host_ID: 3},
+	{Agent_name: "Agent Host1", Agent_secret: "11:11:11:11", Host_ID: 1, Agent_ID: 1},
+	{Agent_name: "Agent Host2", Agent_secret: "11:11:11:12", Host_ID: 2, Agent_ID: 2},
+	{Agent_name: "Agent Host3", Agent_secret: "11:11:11:13", Host_ID: 3, Agent_ID: 3},
 }
 
-// Endpoints & Data Aggregation Functions
 func getHosts(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, hosts)
 }
@@ -61,15 +61,21 @@ func getAgents(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, agents)
 }
 
+func getAgentByID(c *gin.Context) {
+	id := c.Param("id")
+
+	for _, a := range agents {
+		if strconv.Itoa(a.Host_ID) == id {
+			c.IndentedJSON(http.StatusOK, a)
+			return
+		}
+	}
+	c.IndentedJSON(http.StatusNotFound, gin.H{"message": "no agent under that id"})
+}
+
 // POST Functions
 func registerAgent(c *gin.Context) {
 	var newAgent Agent
-	// fmt.Println(c.BindJSON(&newAgent))
-
-	response, err := c.GetRawData()
-	if err == nil {
-		fmt.Println(response)
-	}
 
 	if err := c.BindJSON(&newAgent); err != nil {
 		// TODO: Add logs
@@ -81,26 +87,79 @@ func registerAgent(c *gin.Context) {
 	c.IndentedJSON(http.StatusCreated, newAgent)
 }
 
-func getAgentByID(c *gin.Context) {
+func registerHost(c *gin.Context) {
+	var newHost Host
+
+	if err := c.BindJSON(&newHost); err != nil {
+		// TODO: Add logs
+		// TODO: Add errorhandling
+		return
+	}
+
+	hosts = append(hosts, newHost)
+	c.IndentedJSON(http.StatusCreated, newHost)
+}
+
+func getHostByAgentID(c *gin.Context) {
+	var agent_by_id Agent
+
+	// gets the value from /agent/:id/host
 	id := c.Param("id")
 
+	// finds the agent by the URL-ID
 	for _, a := range agents {
 		if strconv.Itoa(a.Host_ID) == id {
-			c.IndentedJSON(http.StatusOK, a)
+			// c.IndentedJSON(http.StatusOK, a)
+			agent_by_id = a
+		}
+	}
+
+	// finds host with same id as agent
+	for _, host := range hosts {
+		if host.ID == agent_by_id.Agent_ID {
+			c.IndentedJSON(http.StatusOK, host)
 			return
 		}
 	}
 	c.IndentedJSON(http.StatusNotFound, gin.H{"message": "no agent under that id"})
 }
 
 func main() {
+	// Endpoints & Data Aggregation Functions
+
+	//  API v0.1 structure:
+	//  /hosts
+	//  GET: ✅
+	//    - shows all hosts and the hosts data
+	//  POST: ✅
+	//    - adds new host to 'hosts'-slice
+	//
+	//
+	//  /agents
+	//  GET: ✅
+	//    - shows all agents and the agents data
+	//  POST: ✅
+	//    - adds new agent to 'agents'-slice
+	//  /agent/:id/host ✅
+	//  GET:
+	//    - shows the host connected to the agent
+	//  /agent/:id
+	//  GET: ✅
+	//    - shows agent with
+	//
+	//  /commandqueue/agent
+	//  GET:
+	//    - respond with 'no commands' or 'new commands'
+	//  POST:
+	//    - post Agent.agent_secret_key, respond with commands
+
 	router := gin.Default()
 	router.GET("/hosts", getHosts)
+	router.POST("/hosts", registerHost)
 	router.GET("/agents", getAgents)
-	router.GET("/agents/:id", getAgentByID)
-	router.POST("/agents/register", controllers.registerAgent)
-
 	router.POST("/agents", registerAgent)
+	router.GET("/agent/:id", getAgentByID)
+	router.GET("/agent/:id/host", getHostByAgentID)
 
 	// TODO: create logs
 	// TODO: write error to logs