Rename module to match Git repository URL

10 months ago · 63e3333c4d
parent cb7a3a8fa5
commit 63e3333c4d
8 changed files with 35 additions and 41 deletions
--- a/changelog.md
+++ b/changelog.md
@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  1. default config file idp.toml
  2. config files given via the `--conf` command line argument
  3. environment variables with the `IDP_` prefix
+- rename module to match Git repository URL
 ### Fixed
 - run deb-systemd-helper in Debian package `postinst` script

--- a/cmd/idp/main.go
+++ b/cmd/idp/main.go
@ -31,16 +31,14 @@ import (
 	"sync/atomic"
 	"time"

+	"code.cacert.org/cacert/oidc-idp/internal/handlers"
+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/go-openapi/runtime/client"
 	"github.com/gorilla/csrf"
 	"github.com/knadh/koanf"
 	hydra "github.com/ory/hydra-client-go/client"
 	log "github.com/sirupsen/logrus"
-
-	"code.cacert.org/cacert/oidc_idp/ui"
-
-	"code.cacert.org/cacert/oidc_idp/internal/handlers"
-	"code.cacert.org/cacert/oidc_idp/internal/services"
 )

 const (
--- a/go.mod
+++ b/go.mod
@ -1,4 +1,4 @@
-module code.cacert.org/cacert/oidc_idp
+module code.cacert.org/cacert/oidc-idp

 go 1.19

--- a/internal/handlers/consent.go
+++ b/internal/handlers/consent.go
@ -32,13 +32,13 @@ import (
 	"github.com/lestrrat-go/jwx/jwt/openid"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/ory/hydra-client-go/client/admin"
-	"github.com/ory/hydra-client-go/models"
+	hydra "github.com/ory/hydra-client-go/models"
 	log "github.com/sirupsen/logrus"

-	commonModels "code.cacert.org/cacert/oidc_idp/internal/models"
-	"code.cacert.org/cacert/oidc_idp/ui"
+	"code.cacert.org/cacert/oidc-idp/internal/models"
+	"code.cacert.org/cacert/oidc-idp/ui"

-	"code.cacert.org/cacert/oidc_idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/internal/services"
 )

 type ConsentHandler struct {
@ -156,10 +156,10 @@ func (h *ConsentHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 			consentRequest, err := h.adminClient.AcceptConsentRequest(
 				admin.NewAcceptConsentRequestParams().WithConsentChallenge(challenge).WithBody(
-					&models.AcceptConsentRequest{
+					&hydra.AcceptConsentRequest{
 						GrantAccessTokenAudience: nil,
 						GrantScope:               consentInfo.GrantedScopes,
-						HandledAt:                models.NullTime(time.Now()),
+						HandledAt:                hydra.NullTime(time.Now()),
 						Remember:                 true,
 						RememberFor:              OneDayInSeconds,
 						Session:                  sessionData,
@ -179,7 +179,7 @@ func (h *ConsentHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 		consentRequest, err := h.adminClient.RejectConsentRequest(
 			admin.NewRejectConsentRequestParams().WithConsentChallenge(challenge).WithBody(
-				&models.RejectRequest{}))
+				&hydra.RejectRequest{}))
 		if err != nil {
 			h.logger.WithError(err).Error("reject consent request failed")
 			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@ -194,7 +194,7 @@ func (h *ConsentHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 func (h *ConsentHandler) getRequestedConsentInformation(challenge string, r *http.Request) (
 	*admin.GetConsentRequestOK,
-	*commonModels.OIDCClaimsRequest,
+	*models.OIDCClaimsRequest,
 	error,
 ) {
 	consentData, err := h.adminClient.GetConsentRequest(
@ -214,7 +214,7 @@ func (h *ConsentHandler) getRequestedConsentInformation(challenge string, r *htt
 		return nil, nil, fmt.Errorf("error getting consent information: %w", err)
 	}

-	var requestedClaims commonModels.OIDCClaimsRequest
+	var requestedClaims models.OIDCClaimsRequest

 	requestURL, err := url.Parse(consentData.Payload.RequestURL)
 	if err != nil {
@ -241,7 +241,7 @@ func (h *ConsentHandler) renderConsentForm(
 	w http.ResponseWriter,
 	r *http.Request,
 	consentData *admin.GetConsentRequestOK,
-	claims *commonModels.OIDCClaimsRequest,
+	claims *models.OIDCClaimsRequest,
 	localizer *i18n.Localizer,
 ) error {
 	trans := func(id string, values ...map[string]interface{}) string {
@ -289,7 +289,7 @@ type scopeWithLabel struct {
 }

 func (h *ConsentHandler) mapRequestedScope(
-	scope models.StringSlicePipeDelimiter,
+	scope hydra.StringSlicePipeDelimiter,
 	localizer *i18n.Localizer,
 ) []*scopeWithLabel {
 	result := make([]*scopeWithLabel, 0)
@ -322,13 +322,13 @@ type claimWithLabel struct {
 }

 func (h *ConsentHandler) mapRequestedClaims(
-	claims *commonModels.OIDCClaimsRequest,
+	claims *models.OIDCClaimsRequest,
 	localizer *i18n.Localizer,
 ) []*claimWithLabel {
 	result := make([]*claimWithLabel, 0)
 	known := make(map[string]bool)

-	for _, claimElement := range []*commonModels.ClaimElement{claims.GetUserInfo(), claims.GetIDToken()} {
+	for _, claimElement := range []*models.ClaimElement{claims.GetUserInfo(), claims.GetIDToken()} {
 		if claimElement != nil {
 			for k, v := range *claimElement {
 				if _, ok := supportedClaims[k]; !ok {
@ -363,9 +363,9 @@ func (h *ConsentHandler) mapRequestedClaims(
 func (h *ConsentHandler) getSessionData(
 	r *http.Request,
 	info ConsentInformation,
-	claims *commonModels.OIDCClaimsRequest,
-	payload *models.ConsentRequest,
-) (*models.ConsentRequestSession, error) {
+	claims *models.OIDCClaimsRequest,
+	payload *hydra.ConsentRequest,
+) (*hydra.ConsentRequestSession, error) {
 	idTokenData := make(map[string]interface{}, 0)
 	accessTokenData := make(map[string]interface{}, 0)

@ -379,7 +379,7 @@ func (h *ConsentHandler) getSessionData(
 		return nil, err
 	}

-	return &models.ConsentRequestSession{
+	return &hydra.ConsentRequestSession{
 		AccessToken: accessTokenData,
 		IDToken:     idTokenData,
 	}, nil
@ -387,8 +387,8 @@ func (h *ConsentHandler) getSessionData(

 func (h *ConsentHandler) fillTokenData(
 	m map[string]interface{},
-	requestedScope models.StringSlicePipeDelimiter,
-	claimsRequest *commonModels.OIDCClaimsRequest,
+	requestedScope hydra.StringSlicePipeDelimiter,
+	claimsRequest *models.OIDCClaimsRequest,
 	consentInformation ConsentInformation,
 	userInfo *UserInfo,
 ) error {
@ -437,7 +437,7 @@ func (h *ConsentHandler) fillTokenData(

 func (h *ConsentHandler) parseUserInfoClaims(
 	m map[string]interface{},
-	userInfoClaims *commonModels.ClaimElement,
+	userInfoClaims *models.ClaimElement,
 	consentInformation ConsentInformation,
 ) error {
 	for claimName, claim := range *userInfoClaims {
@ -457,7 +457,7 @@ func (h *ConsentHandler) parseUserInfoClaims(

 		wantedValue, err := claim.WantedValue()
 		if err != nil {
-			if !errors.Is(err, commonModels.ErrNoValue) {
+			if !errors.Is(err, models.ErrNoValue) {
 				return fmt.Errorf("error handling claim: %w", err)
 			}
 		}
--- a/internal/handlers/error.go
+++ b/internal/handlers/error.go
@ -24,10 +24,9 @@ import (
 	"io/fs"
 	"net/http"

+	"code.cacert.org/cacert/oidc-idp/internal/services"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	log "github.com/sirupsen/logrus"
-
-	"code.cacert.org/cacert/oidc_idp/internal/services"
 )

 type errorKey int
--- a/internal/handlers/login.go
+++ b/internal/handlers/login.go
@ -27,15 +27,13 @@ import (
 	"strconv"
 	"time"

+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/gorilla/csrf"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/ory/hydra-client-go/client/admin"
-	"github.com/ory/hydra-client-go/models"
+	hydra "github.com/ory/hydra-client-go/models"
 	log "github.com/sirupsen/logrus"
-
-	"code.cacert.org/cacert/oidc_idp/ui"
-
-	"code.cacert.org/cacert/oidc_idp/internal/services"
 )

 type acrType string
@ -165,7 +163,7 @@ func (h *LoginHandler) handlePost(
 	// finish login and redirect to target
 	loginRequest, err := h.adminClient.AcceptLoginRequest(
 		admin.NewAcceptLoginRequestParams().WithLoginChallenge(challenge).WithBody(
-			&models.AcceptLoginRequest{
+			&hydra.AcceptLoginRequest{
 				Acr:         string(ClientCertificate),
 				Remember:    true,
 				RememberFor: 0,
@ -216,7 +214,7 @@ func (h *LoginHandler) rejectLogin(w http.ResponseWriter, challenge string, loca

 	rejectLoginRequest, err := h.adminClient.RejectLoginRequest(
 		admin.NewRejectLoginRequestParams().WithLoginChallenge(challenge).WithBody(
-			&models.RejectRequest{
+			&hydra.RejectRequest{
 				ErrorDescription: h.messageCatalog.LookupMessage("LoginDeniedByUser", nil, localizer),
 				ErrorHint:        h.messageCatalog.LookupMessage("HintChooseAnIdentityForAuthentication", nil, localizer),
 				StatusCode:       http.StatusForbidden,
--- a/internal/handlers/logout.go
+++ b/internal/handlers/logout.go
@ -23,12 +23,11 @@ import (
 	"net/http"
 	"time"

+	"code.cacert.org/cacert/oidc-idp/internal/services"
+	"code.cacert.org/cacert/oidc-idp/ui"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/ory/hydra-client-go/client/admin"
 	log "github.com/sirupsen/logrus"
-
-	"code.cacert.org/cacert/oidc_idp/internal/services"
-	"code.cacert.org/cacert/oidc_idp/ui"
 )

 type LogoutHandler struct {
--- a/internal/services/i18n.go
+++ b/internal/services/i18n.go
@ -22,11 +22,10 @@ import (
 	"errors"
 	"fmt"

+	"code.cacert.org/cacert/oidc-idp/translations"
 	log "github.com/sirupsen/logrus"
 	"github.com/yuin/goldmark"

-	"code.cacert.org/cacert/oidc_idp/translations"
-
 	"github.com/BurntSushi/toml"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"golang.org/x/text/language"