0.9.0 (#309)

oidc-mytoken · Dec 5, 2023 · a9466f1 · a9466f1
2 parents 3c638b5 + e9c1ef5
commit a9466f1
Show file tree

Hide file tree

Showing 84 changed files with 2,281 additions and 750 deletions.
diff --git a/.goreleaser-release.yml b/.goreleaser-release.yml
@@ -35,19 +35,19 @@ builds:
       - -trimpath
     mod_timestamp: '{{ .CommitTimestamp }}'
 archives:
-  - replacements:
-      darwin: macOS
-      386: 32-bit
-      amd64: 64-bit
+  - name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_
+      {{ if eq .Os "darwin" }}macOS{{- else }}{{ .Os }}{{ end }}_
+      {{- if eq .Arch "386" }}32-bit{{- else if eq .Arch "amd64" }}64-bit{{- else }}{{ .Arch }}{{ end }}
     format_overrides:
       - goos: windows
         format: zip
 nfpms:
   - id: server-pkg
     package_name: mytoken-server
-    replacements:
-      386: i386
-    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    file_name_template: >-
+      {{ .PackageName }}_{{ .Version }}_
+      {{- if eq .Arch "386" }}i386{{- else }}{{ .Arch }}{{ end }}
     builds:
       - server
     homepage: https://mytoken-docs.data.kit.edu/server
@@ -70,14 +70,14 @@ nfpms:
         type: dir
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .PackageName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .PackageName }}-{{ .Version }}.
+          {{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}
   - id: setup-pkg
     package_name: mytoken-server-setup
-    replacements:
-      386: i386
-    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    file_name_template: >-
+      {{ .PackageName }}_{{ .Version }}_
+      {{- if eq .Arch "386" }}i386{{- else }}{{ .Arch }}{{ end }}
     builds:
       - setup
     homepage: https://mytoken-docs.data.kit.edu/server
@@ -92,14 +92,14 @@ nfpms:
     bindir: /usr/bin
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .PackageName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .PackageName }}-{{ .Version }}.
+          {{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}
   - id: migratedb-pkg
     package_name: mytoken-server-migratedb
-    replacements:
-      386: i386
-    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    file_name_template: >-
+      {{ .PackageName }}_{{ .Version }}_
+      {{- if eq .Arch "386" }}i386{{- else }}{{ .Arch }}{{ end }}
     builds:
       - migratedb
     homepage: https://mytoken-docs.data.kit.edu/server
@@ -116,9 +116,9 @@ nfpms:
     bindir: /usr/bin
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .PackageName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .PackageName }}-{{ .Version }}.
+          {{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}
 dockers:
   - goos: linux
     goarch: amd64

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -35,19 +35,19 @@ builds:
       - -trimpath
     mod_timestamp: '{{ .CommitTimestamp }}'
 archives:
-  - replacements:
-      darwin: macOS
-      386: 32-bit
-      amd64: 64-bit
+  - name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_
+      {{ if eq .Os "darwin" }}macOS{{- else }}{{ .Os }}{{ end }}_
+      {{- if eq .Arch "386" }}32-bit{{- else if eq .Arch "amd64" }}64-bit{{- else }}{{ .Arch }}{{ end }}
     format_overrides:
       - goos: windows
         format: zip
 nfpms:
   - id: server-pkg
     package_name: mytoken-server
-    replacements:
-      386: i386
-    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    file_name_template: >-
+      {{ .PackageName }}_{{ .Version }}_
+      {{- if eq .Arch "386" }}i386{{- else }}{{ .Arch }}{{ end }}
     builds:
       - server
     homepage: https://mytoken-docs.data.kit.edu/server
@@ -70,14 +70,14 @@ nfpms:
         type: dir
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .PackageName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .PackageName }}-{{ .Version }}.
+          {{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}
   - id: setup-pkg
     package_name: mytoken-server-setup
-    replacements:
-      386: i386
-    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    file_name_template: >-
+      {{ .PackageName }}_{{ .Version }}_
+      {{- if eq .Arch "386" }}i386{{- else }}{{ .Arch }}{{ end }}
     builds:
       - setup
     homepage: https://mytoken-docs.data.kit.edu/server
@@ -92,14 +92,14 @@ nfpms:
     bindir: /usr/bin
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .PackageName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .PackageName }}-{{ .Version }}.
+          {{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}
   - id: migratedb-pkg
     package_name: mytoken-server-migratedb
-    replacements:
-      386: i386
-    file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
+    file_name_template: >-
+      {{ .PackageName }}_{{ .Version }}_
+      {{- if eq .Arch "386" }}i386{{- else }}{{ .Arch }}{{ end }}
     builds:
       - migratedb
     homepage: https://mytoken-docs.data.kit.edu/server
@@ -116,9 +116,9 @@ nfpms:
     bindir: /usr/bin
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .PackageName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .PackageName }}-{{ .Version }}.
+          {{- if eq .Arch "386" }}i386{{- else if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end }}
 dockers:
   - goos: linux
     goarch: amd64

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,54 @@
 <!-- ### Dependencies -->
 <!--  -->
 
+## mytoken 0.9.0
+
+### Changes
+
+- Changed the tokeninfo history api when used with a `mom_id`, now multiple `mom_ids` can be passed in a single
+  request. Also, the response now contains the `mom_id` in the entry object.
+
+### Features
+
+- Added experimental support for OpenID Connect federations
+- Added "Guest mode" to try mytoken out without using a real OP
+
+### API
+
+- Added `mom_id` parameter to tokeninfo introspection response
+- Added `mom_id` parameter to mytoken responses
+
+### Enhancements
+
+- Webinterface: Improved the title / placeholder for the `hosts` restrictions key in the GUI editor to make it more
+  clear that also subnets can be used.
+- Webinterface: Changed the login provider selector and added search functionality
+- Webinterface: Improved (re-)discovery of mytoken configuration
+- Webinterface: Fixed a problem with scope discovery if there was no OP selected.
+- Profiles: Improved / Fixed includes in especially restrictions when includes involve arrays.
+
+### Bugfixes
+
+- Finally fixed a problem with database times when the database was not set to UTC.
+- Fixed a bug where sometimes a 'state mismatch' occured
+
+### Dependencies
+
+- Bump golang.org/x/mod from 0.11.0 to 0.14.0
+- Bump golang.org/x/oauth2 from 0.9.0 to 0.15.0
+- Bump golang.org/x/term from 0.9.0 to 0.15.0
+- Bump golang.org/x/crypto from 0.10.0 to 0.16.0
+- Bump golang.org/x/net from 0.14.0 to 0.17.0
+- Bump github.com/valyala/fasthttp from 1.47.0 to 1.51.0
+- Bump github.com/gofiber/fiber/v2 from 2.49.1 to 2.51.0
+- Bump github.com/gofiber/template/mustache/v2 from 2.0.4 to 2.0.7
+- Bump github.com/lestrrat-go/jwx from 1.2.26 to 1.2.27
+- Bump github.com/redis/go-redis/v9 from 9.1.0 to 9.3.0
+- Bump github.com/evanphx/json-patch/v5 from 5.6.0 to 5.7.0
+- Bump github.com/go-resty/resty/v2 from 2.7.0 to 2.10.0
+- Bump github.com/go-jose/go-jose/v3 from 3.0.0 to 3.0.1
+- Bump github.com/coreos/go-oidc/v3 from 3.6.0 to 3.8.0
+
 ## mytoken 0.8.1
 
 ### Enhancements

diff --git a/README.md b/README.md
@@ -2,7 +2,6 @@
 
 [![License](https://img.shields.io/github/license/oidc-mytoken/server.svg)](https://github.com/oidc-mytoken/server/blob/master/LICENSE)
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/oidc-mytoken/server)
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/oidc-mytoken/server/Go)
 [![Go Report](https://goreportcard.com/badge/github.com/oidc-mytoken/server)](https://goreportcard.com/report/github.com/oidc-mytoken/server)
 [![DeepSource](https://deepsource.io/gh/oidc-mytoken/server.svg/?label=active+issues&show_trend=true)](https://deepsource.io/gh/oidc-mytoken/server/?ref=repository-badge)
 [![Release date](https://img.shields.io/github/release-date/oidc-mytoken/server.svg)](https://github.com/oidc-mytoken/server/releases/latest)

diff --git a/cmd/mytoken-server/main.go b/cmd/mytoken-server/main.go
@@ -16,8 +16,11 @@ import (
 	"github.com/oidc-mytoken/server/internal/endpoints/settings"
 	"github.com/oidc-mytoken/server/internal/jws"
 	"github.com/oidc-mytoken/server/internal/model/version"
-	"github.com/oidc-mytoken/server/internal/oidc/authcode"
+	"github.com/oidc-mytoken/server/internal/oidc/oidcfed"
+	provider2 "github.com/oidc-mytoken/server/internal/oidc/provider"
 	"github.com/oidc-mytoken/server/internal/server"
+	"github.com/oidc-mytoken/server/internal/server/routes"
+	"github.com/oidc-mytoken/server/internal/utils/cache"
 	"github.com/oidc-mytoken/server/internal/utils/cookies"
 	"github.com/oidc-mytoken/server/internal/utils/geoip"
 	loggerUtils "github.com/oidc-mytoken/server/internal/utils/logger"
@@ -27,11 +30,14 @@ func main() {
 	handleSignals()
 	config.Load()
 	loggerUtils.Init()
+	cache.InitCache()
+	routes.Init()
+	provider2.Init()
 	server.Init()
 	configurationEndpoint.Init()
-	authcode.Init()
+	oidcfed.Init()
 	versionrepo.ConnectToVersion()
-	jws.LoadKey()
+	jws.LoadMytokenSigningKey()
 	httpclient.Init(config.Get().IssuerURL, fmt.Sprintf("mytoken-server %s", version.VERSION))
 	geoip.Init()
 	settings.InitSettings()
@@ -62,8 +68,9 @@ func reload() {
 	loggerUtils.SetOutput()
 	loggerUtils.MustUpdateAccessLogger()
 	db.Connect()
-	jws.LoadKey()
+	jws.LoadMytokenSigningKey()
 	geoip.Init()
+	oidcfed.Discovery()
 }
 
 func reloadLogFiles() {

diff --git a/cmd/mytoken-server/mytoken-migratedb/main.go b/cmd/mytoken-server/mytoken-migratedb/main.go
@@ -36,7 +36,7 @@ var app = &cli.App{
 			Email: "[email protected]",
 		},
 	},
-	Copyright:              "Karlsruhe Institute of Technology 2020-2022",
+	Copyright:              "Karlsruhe Institute of Technology 2020-2023",
 	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
 		&cli.StringFlag{