addressed comments

Signed-off-by: Atul-source <[email protected]>
l3af-project · Sep 6, 2024 · 2b435f5 · 2b435f5
1 parent 93fd4ee
commit 2b435f5
Show file tree

Hide file tree

Showing 20 changed files with 414 additions and 380 deletions.
diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml
@@ -26,7 +26,7 @@ jobs:
           sudo apt update
           sudo systemctl stop ufw
           sudo apt install -y iproute2
-          sudo apt install git curl hey
+          sudo apt install git curl hey net-tools
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
@@ -37,6 +37,9 @@ jobs:
           sudo bash /root/l3af-arch/dev_environment/e2e_test/prep_env.sh
           sudo bash /root/l3af-arch/dev_environment/setup_linux_dev_env.sh --ci-build
           hm=$(hostname)
+          ip a
+          ps -ef | grep l3af
+          netstat -anp
           sudo find /root/l3af-arch/dev_environment/e2e_test -type f -name "*.json" -exec sed -i "s/l3af-test-host/$hm/g" {} +
           
       - name: Run Tests

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -26,7 +26,7 @@ jobs:
       actions: read
       contents: read
       security-events: write
-      
+
     strategy:
       fail-fast: false
       matrix:
@@ -39,40 +39,12 @@ jobs:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
     - name: Checkout repository
-      uses: actions/checkout@2d7d9f7ff5b310f983d059b68785b3c74d8b8edd
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@e1f83c153a6cb7134f035e16e2626b216e7168c9
+      uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93
       with:
         languages: ${{ matrix.language }}
 
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@9e39a05578dd315aad814d3c71bd03472cc5b815
-
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4067cdab784c667cf1b7fa95169f3a0e0a381d63
-      with:
-        category: "/language:${{matrix.language}}"
-        output: sarif-results
-        upload: failure-only
-
-    - name: filter-sarif
-      uses: advanced-security/filter-sarif@59d0a64b3c0a34d787819f6659708915b6210582
-      with:
-        patterns: |
-          +**/*.go
-          -artifact/artifact.go
-        input: sarif-results/go.sarif
-        output: sarif-results/go.sarif
-
-    - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@2bbafcdd7fbf96243689e764c2f15d9735164f33
-      with:
-        sarif_file: sarif-results/go.sarif
-
-    - name: Upload loc as a Build Artifact
-      uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4
-      with:
-        name: sarif-results
-        path: sarif-results
-        retention-days: 1
+      uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93
diff --git a/apis/handlers/addprog.go b/apis/handlers/addprog.go
@@ -42,7 +42,7 @@ func AddEbpfPrograms(ctx context.Context, bpfcfg *bpfprogs.NFConfigs) http.Handl
 		}(&mesg, &statusCode)
 		if models.IsReadOnly {
 			log.Warn().Msgf("We are in Between Restart Please try after some time")
-			mesg = "We are in Between Restart Please try after some time"
+			mesg = "We are currently in the middle of a restart. Please attempt again after a while."
 			return
 		}
 		defer DecWriteReq()

diff --git a/apis/handlers/deleteprog.go b/apis/handlers/deleteprog.go
@@ -42,7 +42,7 @@ func DeleteEbpfPrograms(ctx context.Context, bpfcfg *bpfprogs.NFConfigs) http.Ha
 		}(&mesg, &statusCode)
 		if models.IsReadOnly {
 			log.Warn().Msgf("We are in Between Restart Please try after some time")
-			mesg = "We are in Between Restart Please try after some time"
+			mesg = "We are currently in the middle of a restart. Please attempt again after a while."
 			return
 		}
 		defer DecWriteReq()

diff --git a/apis/handlers/restart_linux.go b/apis/handlers/restart_linux.go
@@ -11,14 +11,13 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"regexp"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"syscall"
 	"time"
 
 	"net/http"
-	"net/url"
 
 	"github.com/rs/zerolog/log"
 
@@ -50,7 +49,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 		}(&mesg, &statusCode)
 		if models.IsReadOnly {
 			log.Warn().Msgf("We are in Between Restart Please try after some time")
-			mesg = "We are in Between Restart Please try after some time"
+			mesg = "We are currently in the middle of a restart. Please attempt again after a while."
 			statusCode = http.StatusInternalServerError
 			return
 		}
@@ -73,14 +72,6 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 			statusCode = http.StatusInternalServerError
 			return
 		}
-
-		match, _ := regexp.MatchString(`^v\d+\.\d+\.\d+$`, t.Version)
-		if !match {
-			mesg = "version naming convention is wrong it will like vx.y.z"
-			log.Error().Msg(mesg)
-			statusCode = http.StatusInternalServerError
-			return
-		}
 		machineHostname, err := os.Hostname()
 		if err != nil {
 			mesg = "failed to get os hostname"
@@ -94,25 +85,6 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 			statusCode = http.StatusInternalServerError
 			return
 		}
-		URL, err := url.Parse(t.ArtifactURL)
-		if err != nil {
-			mesg = "url format is wrong"
-			log.Error().Msg(mesg)
-			statusCode = http.StatusInternalServerError
-			return
-		}
-		if URL.Scheme != models.HttpScheme && URL.Scheme != models.FileScheme && URL.Scheme != models.HttpsScheme {
-			mesg = "currently only http,https,file is supported"
-			log.Error().Msg(mesg)
-			statusCode = http.StatusInternalServerError
-			return
-		}
-		if strings.Contains(t.ArtifactURL, "..") {
-			mesg = "bad string"
-			log.Error().Msg(mesg)
-			statusCode = http.StatusInternalServerError
-			return
-		}
 		defer func() {
 			models.IsReadOnly = false
 		}()
@@ -128,14 +100,14 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 			time.Sleep(time.Millisecond)
 		}
 
-		oldCfgPath, err := restart.ReadSymlink(bpfcfg.HostConfig.BasePath + "/latest/l3afd.cfg")
+		oldCfgPath, err := restart.ReadSymlink(filepath.Join(bpfcfg.HostConfig.BasePath, "latest/l3afd.cfg"))
 		if err != nil {
 			mesg = fmt.Sprintf("failed read symlink: %v", err)
 			log.Error().Msg(mesg)
 			statusCode = http.StatusInternalServerError
 			return
 		}
-		oldBinPath, err := restart.ReadSymlink(bpfcfg.HostConfig.BasePath + "/latest/l3afd")
+		oldBinPath, err := restart.ReadSymlink(filepath.Join(bpfcfg.HostConfig.BasePath, "latest/l3afd"))
 		if err != nil {
 			mesg = fmt.Sprintf("failed to read symlink: %v", err)
 			log.Error().Msg(mesg)
@@ -144,12 +116,18 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 		}
 		oldVersion := strings.Split(strings.Trim(oldBinPath, bpfcfg.HostConfig.BasePath+"/"), "/")[0]
 
-		err = restart.GetNewVersion(t.ArtifactURL, oldVersion, t.Version, bpfcfg.HostConfig)
+		if _, ok := models.AvailableVersions[t.Version]; !ok {
+			mesg = "invalid version to upgrade"
+			log.Error().Msg(mesg)
+			statusCode = http.StatusInternalServerError
+			return
+		}
+		err = restart.GetNewVersion(models.L3AFDRestartArtifactName, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 		if err != nil {
-			mesg = fmt.Sprintf("failed to getNewVersion: %v", err)
+			mesg = fmt.Sprintf("failed to get new version: %v", err)
 			log.Error().Msg(mesg)
 			statusCode = http.StatusInternalServerError
-			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, t.Version, bpfcfg.HostConfig)
+			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 			mesg = mesg + fmt.Sprintf("rollback of symlink failed: %v", err)
 			return
 		}
@@ -158,7 +136,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 		ln, err := net.Listen("unix", models.HostSock)
 		if err != nil {
 			log.Err(err)
-			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, t.Version, bpfcfg.HostConfig)
+			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 			mesg = mesg + fmt.Sprintf("rollback of symlink failed: %v", err)
 			statusCode = http.StatusInternalServerError
 			return
@@ -195,7 +173,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 			lf, err := lis.File()
 			if err != nil {
 				log.Error().Msgf("%v", err)
-				err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, t.Version, bpfcfg.HostConfig)
+				err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 				mesg = mesg + fmt.Sprintf("rollback of symlink failed: %v", err)
 				statusCode = http.StatusInternalServerError
 				isErr = true
@@ -209,7 +187,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 			return
 		}
 		// we have added
-		cmd := exec.Command(bpfcfg.HostConfig.BasePath+"/latest/l3afd", "--config", bpfcfg.HostConfig.BasePath+"/latest/l3afd.cfg")
+		cmd := exec.Command(filepath.Join(bpfcfg.HostConfig.BasePath, "latest/l3afd"), "--config", filepath.Join(bpfcfg.HostConfig.BasePath, "latest/l3afd.cfg"))
 		cmd.SysProcAttr = &syscall.SysProcAttr{
 			Setsid: true,
 		}
@@ -238,7 +216,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 				log.Error().Msgf("%v", err)
 				mesg = mesg + fmt.Sprintf("unable to create pid file: %v", err)
 			}
-			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, t.Version, bpfcfg.HostConfig)
+			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 			if err != nil {
 				mesg = mesg + fmt.Sprintf("rollback of symlink failed: %v", err)
 			}
@@ -257,7 +235,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 					f = true
 					break
 				}
-				fmt.Println("Waiting for socket to be up...")
+				log.Info().Msgf("Waiting for socket to be up...")
 				time.Sleep(time.Second) // sleep for a second before trying again
 			}
 			if !f {
@@ -296,7 +274,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 					log.Error().Msgf("%v", err)
 					mesg = mesg + fmt.Sprintf("unable to create pid file: %v", err)
 				}
-				err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, t.Version, bpfcfg.HostConfig)
+				err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 				if err != nil {
 					mesg = mesg + fmt.Sprintf("rollback of symlink failed: %v", err)
 				}
@@ -327,7 +305,7 @@ func HandleRestart(bpfcfg *bpfprogs.NFConfigs) http.HandlerFunc {
 				log.Error().Msgf("%v", err)
 				mesg = mesg + fmt.Sprintf("unable to create pid file: %v", err)
 			}
-			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, t.Version, bpfcfg.HostConfig)
+			err = restart.RollBackSymlink(oldCfgPath, oldBinPath, oldVersion, models.AvailableVersions[t.Version], bpfcfg.HostConfig)
 			if err != nil {
 				mesg = mesg + fmt.Sprintf("rollback of symlink failed: %v", err)
 			}

diff --git a/apis/handlers/updateconfig.go b/apis/handlers/updateconfig.go
@@ -42,7 +42,7 @@ func UpdateConfig(ctx context.Context, bpfcfg *bpfprogs.NFConfigs) http.HandlerF
 		}(&mesg, &statusCode)
 		if models.IsReadOnly {
 			log.Warn().Msgf("We are in Between Restart Please try after some time")
-			mesg = "We are in Between Restart Please try after some time"
+			mesg = "We are currently in the middle of a restart. Please attempt again after a while."
 			return
 		}
 		defer DecWriteReq()