Commit b1080dc0 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

update go version, print auth error

parent f9f377ec

.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.5.0

  TAG: 0.5.1



# This import is for the func_rse_docker_* functions

before_script:

dockerfiles/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ ARG DEBIAN_FRONTEND=noninteractive 


RUN apt-get update && apt-get install -y cmake vim wget g++ rpm



RUN wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz

RUN tar -C /usr/local -xzf go1.20.5.linux-amd64.tar.gz

RUN wget https://go.dev/dl/go1.21.6.linux-amd64.tar.gz

RUN tar -C /usr/local -xzf go1.21.6.linux-amd64.tar.gz



ENV PATH=$PATH:/usr/local/go/bin

RUN GOBIN=/usr/local/go/bin/ go install github.com/jstemmer/go-junit-report/v2@latest

src/utils/authnz.go

+3 −3
Original line number Diff line number Diff line
@@ -131,12 +131,12 @@ func (a *JWTAuth) CheckAndGetContent(tokenString string) (string, error) { 
			return nil, fmt.Errorf("Invalid key ID")

		}

		publicKey, err := GetPublicKey(keys, keyID)

		if publicKey == nil {

			return nil, fmt.Errorf("Public key not found for key ID: %s", keyID)

		}

		if err != nil {

			return nil, fmt.Errorf("Error getting public key: %e", err)

		}

		if publicKey == nil {

			return nil, fmt.Errorf("Public key not found for key ID: %s", keyID)

		}

		return publicKey, nil

	})