Commit bab5800d authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Resolved PR comments

parent 4c76aa49

.meepctl-repocfg.yaml

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ repo: 
        # AdvantEDGE resources included in Docker container image

        docker-data:

          # location of REST API permissions file

          'permissions.yaml': config/public-permissions.yaml

          'permissions.yaml': config/permissions-open.yaml

      meep-ingress-certs:

        # enable meepctl build

        build: false

go-apps/meep-auth-svc/server/auth-svc.go

+14 −9
Original line number Diff line number Diff line
@@ -484,12 +484,14 @@ func sessionTimeoutCb(session *sm.Session) { 
	metricSessionTimeout.Inc()



	// Destroy session sandbox

	if session.Sandbox != "" {

		_, err := authSvc.pfmCtrlClient.SandboxControlApi.DeleteSandbox(context.TODO(), session.Sandbox)

		if err == nil {

			metricSessionActive.Dec()

			metricSessionDuration.Observe(time.Since(session.StartTime).Minutes())

		}

	}

}



// Generate a random state string

func generateState(n int) (string, error) {
@@ -927,7 +929,7 @@ func startSession(provider string, username string, w http.ResponseWriter, r *ht 
		}



		// Get requested sandbox name & role from user profile, if any

		providerMode := strings.TrimSpace(os.Getenv("MEEP_OAUTH_GITHUB_PROVIDER_MODE"))

		providerMode := strings.TrimSpace(os.Getenv("MEEP_OAUTH_PROVIDER_MODE"))

		role := users.RoleUser

		user, err := authSvc.userStore.GetUser(provider, username)

		if err == nil {
@@ -935,7 +937,7 @@ func startSession(provider string, username string, w http.ResponseWriter, r *ht 
			role = user.Role

		}

		if err != nil && providerMode == providerModeSecure {

			return "", false, "", err, http.StatusPreconditionFailed

			return "", false, "", err, http.StatusUnauthorized

		}



		// Create sandbox
@@ -994,12 +996,15 @@ func asLogout(w http.ResponseWriter, r *http.Request) { 
		metric.Provider = session.Provider

		metric.User = session.Username

		metric.Sandbox = session.Sandbox



		// Delete sandbox

		if session.Sandbox != "" {

			_, err = authSvc.pfmCtrlClient.SandboxControlApi.DeleteSandbox(context.TODO(), session.Sandbox)

			if err == nil {

				sandboxDeleted = true

			}

		}

	}



	// Delete session

	err, code := sessionStore.Del(w, r)

go-apps/meep-tc-engine/go.mod

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-net-char-mgr v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-pdu-session-store v0.0.0 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-redis v0.0.0

	github.com/gogo/protobuf v1.2.1 // indirect

	github.com/google/btree v1.0.0 // indirect