Commit 08256f45 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

allow token from multiple IDPs

parent af2507e3

.gitignore

+2 −1
Original line number Diff line number Diff line 
.idea

.dockerignore

build

conf.json
 
 No newline at end of file

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  TAG: 0.4.0

  TAG: 0.5.0



# This import is for the func_rse_docker_* functions

before_script:

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ORNL") 
SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL")



set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "4")

set(CPACK_PACKAGE_VERSION_MINOR "5")

set(CPACK_PACKAGE_VERSION_PATCH "0")



INCLUDE(CPack)

src/common/settings.go

+6 −4
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ type serverSettings struct { 
	TestCommand   string

	Auth          struct {

		Enabled    bool

		JwksUrl  string

		JwksUrls   []string

		UserFields []string

		UserList   []string

	}

	Http struct {
@@ -54,7 +55,8 @@ func ReadConfig(fname string) error { 
	viper.SetDefault("LogSettings.MaxBackups", 3)

	viper.SetDefault("Auth.Enabled", false)

	viper.SetDefault("Auth.UserList", []string{})

	viper.SetDefault("Auth.JwksUrl", "")

	viper.SetDefault("Auth.UserFields", []string{})

	viper.SetDefault("Auth.JwksUrls", []string{})



	if fname != "" {

		viper.SetConfigFile(fname)

src/common/version.go

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import ( 
var version string



func init() {

	version = "0.4.0"

	version = "0.5.0"

	rdbApiVersion = "v0.1"

}