Skip to content

env fix #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2020
Merged

env fix #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/argocdServer/Config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ type Config struct {
Host string `env:"CD_HOST" envDefault:"localhost"`
Port string `env:"CD_PORT" envDefault:"8000"`
Namespace string `env:"CD_NAMESPACE" envDefault:"devtroncd"`
Environment string `env:"CD_ENVIRONMENT" envDefault:"DEV"` //TODO: make this config global
}

func GetConfig() (*Config, error) {
Expand Down
2 changes: 1 addition & 1 deletion client/gitSensor/GitSensorClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ type GitSensorClient interface {
//----------------------impl
type GitSensorConfig struct {
Url string `env:"GIT_SENSOR_URL" envDefault:"http://localhost:9999"`
Timeout int `env:"ACD_TIMEOUT" envDefault:"0"` // in seconds
Timeout int `env:"GIT_SENSOR_TIMEOUT" envDefault:"0"` // in seconds
}

type GitSensorClientImpl struct {
Expand Down
11 changes: 4 additions & 7 deletions pkg/auth/Config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@

package auth

import "github.com/caarlos0/env"

type Config struct {
AuthEnabled bool `env:"AUTH_ENABLED" envDefault:"true"`
AuthEnabled bool
}

func GetConfig() (*Config, error) {
cfg := &Config{}
err := env.Parse(cfg)
return cfg, err
func GetConfig() *Config {
cfg := &Config{AuthEnabled: true}
return cfg
}
18 changes: 8 additions & 10 deletions pkg/user/UserAuthService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ package user

import (
"context"
"github.com/devtron-labs/devtron/api/bean"
session2 "github.com/devtron-labs/devtron/client/argocdServer/session"
"github.com/devtron-labs/devtron/internal/constants"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/auth"
"encoding/base64"
"encoding/json"
"errors"
Expand All @@ -33,6 +27,12 @@ import (
"github.com/caarlos0/env"
"github.com/casbin/casbin"
"github.com/coreos/go-oidc"
"github.com/devtron-labs/devtron/api/bean"
session2 "github.com/devtron-labs/devtron/client/argocdServer/session"
"github.com/devtron-labs/devtron/internal/constants"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/pkg/auth"
"github.com/dgrijalva/jwt-go"
"github.com/gorilla/sessions"
"go.uber.org/zap"
Expand Down Expand Up @@ -356,10 +356,8 @@ func Authorizer(e *casbin.Enforcer, sessionManager *session.SessionManager) func
//users = append(users, "anonymous")
authEnabled := true
pass := false
config, err := auth.GetConfig()
if err == nil {
authEnabled = config.AuthEnabled
}
config := auth.GetConfig()
authEnabled = config.AuthEnabled
if len(token) != 0 && authEnabled && !contains(r.URL.Path) {
_, err := sessionManager.VerifyToken(token)
if err != nil {
Expand Down