Merge branch 'main' into cira

Author: rsdmike

.github/.golangci.yml

@@ -1,6 +1,6 @@
 linters-settings:
   gci:
-    local-prefixes: github.com/open-amt-cloud-toolkit/console
+    local-prefixes: github.com/device-management-toolkit/console
   errorlint:
     errorf: true
   errcheck:

.github/workflows/ci.yml

@@ -98,9 +98,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.22.x, 1.23.x]
+        go-version: [1.23.x, 1.24.x]
         os:
-          [windows-2019, windows-2022, ubuntu-22.04, ubuntu-20.04, ubuntu-24.04]
+          [windows-2019, windows-2022, ubuntu-22.04, ubuntu-24.04]
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
@@ -127,6 +127,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: GitHub Upload Release Artifacts
+        if: always()
         uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: JUnit Results ${{matrix.os}}-${{matrix.go-version}}-${{github.run_attempt}}

.github/workflows/release.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Check out Sample Web UI
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
         with:
-          repository: open-amt-cloud-toolkit/sample-web-ui
+          repository: device-management-toolkit/sample-web-ui
           ref: main
           path: ./temp
 
@@ -106,17 +106,17 @@ jobs:
       - shell: bash
         if: matrix.os == 'ubuntu-latest'
         run: |
-          CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X 'github.com/open-amt-cloud-toolkit/console/internal/app.Version=${{ needs.prepare.outputs.version }}'" -trimpath -o dist/linux/console_linux_x64 ./cmd/app/main.go
+          CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X 'github.com/device-management-toolkit/console/internal/app.Version=${{ needs.prepare.outputs.version }}'" -trimpath -o dist/linux/console_linux_x64 ./cmd/app/main.go
 
       - shell: bash
         if: matrix.os == 'windows-latest'
         run: |
-          CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X 'github.com/open-amt-cloud-toolkit/console/internal/app.Version=${{ needs.prepare.outputs.version }}'" -trimpath -o dist/windows/console_windows_x64.exe ./cmd/app/main.go
+          CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X 'github.com/device-management-toolkit/console/internal/app.Version=${{ needs.prepare.outputs.version }}'" -trimpath -o dist/windows/console_windows_x64.exe ./cmd/app/main.go
 
       - shell: bash
         if: matrix.os == 'macos-latest'
         run: |
-          CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -ldflags "-s -w -X 'github.com/open-amt-cloud-toolkit/console/internal/app.Version=${{ needs.prepare.outputs.version }}'" -trimpath -o dist/darwin/console_mac_arm64 ./cmd/app/main.go
+          CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -ldflags "-s -w -X 'github.com/device-management-toolkit/console/internal/app.Version=${{ needs.prepare.outputs.version }}'" -trimpath -o dist/darwin/console_mac_arm64 ./cmd/app/main.go
 
       - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         if: matrix.os == 'ubuntu-latest'

.golangci.yml

@@ -1,6 +1,6 @@
 linters-settings:
   gci:
-    local-prefixes: github.com/open-amt-cloud-toolkit/console
+    local-prefixes: github.com/device-management-toolkit/console
   errorlint:
     errorf: true
   errcheck:

.releaserc.json

@@ -9,7 +9,17 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "releaseRules": [
+          {
+            "type": "chore",
+            "release": "patch"
+          }
+        ]
+      }
+    ],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     [

Dockerfile

@@ -1,21 +1,24 @@
 # Step 1: Modules caching
-FROM golang:1.24-alpine3.20@sha256:3d9132b88a6317b846b55aa8e821821301906fe799932ecbc4f814468c6977a5 AS modules
+FROM golang:1.24-alpine3.20@sha256:9f98e9893fbc798c710f3432baa1e0ac6127799127c3101d2c263c3a954f0abe AS modules
 COPY go.mod go.sum /modules/
 WORKDIR /modules
 RUN apk add --no-cache git
 RUN go mod download
 
 # Step 2: Builder
-FROM golang:1.24-alpine3.20@sha256:3d9132b88a6317b846b55aa8e821821301906fe799932ecbc4f814468c6977a5 AS builder
+FROM golang:1.24-alpine3.20@sha256:9f98e9893fbc798c710f3432baa1e0ac6127799127c3101d2c263c3a954f0abe AS builder
 COPY --from=modules /go/pkg /go/pkg
 COPY . /app
 WORKDIR /app
 RUN go mod tidy
+RUN mkdir -p /app/tmp/
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
   go build -o /bin/app ./cmd/app
 RUN mkdir -p /.config/device-management-toolkit
 # Step 3: Final
 FROM scratch
+ENV TMPDIR=/tmp
+COPY --from=builder /app/tmp /tmp
 COPY --from=builder /app/config /config
 COPY --from=builder /app/internal/app/migrations /migrations
 COPY --from=builder /bin/app /app

README.md

@@ -1,25 +1,23 @@
-![Build](https://img.shields.io/github/actions/workflow/status/open-amt-cloud-toolkit/console/ci.yml?style=for-the-badge&label=Build&logo=github)
-![Codecov](https://img.shields.io/codecov/c/github/open-amt-cloud-toolkit/console?style=for-the-badge&logo=codecov)
-[![OSSF-Scorecard Score](https://img.shields.io/ossf-scorecard/github.com/open-amt-cloud-toolkit/console?style=for-the-badge&label=OSSF%20Score)](https://api.securityscorecards.dev/projects/github.com/open-amt-cloud-toolkit/console)
+![Build](https://img.shields.io/github/actions/workflow/status/device-management-toolkit/console/ci.yml?style=for-the-badge&label=Build&logo=github)
+![Codecov](https://img.shields.io/codecov/c/github/device-management-toolkit/console?style=for-the-badge&logo=codecov)
+[![OSSF-Scorecard Score](https://img.shields.io/ossf-scorecard/github.com/device-management-toolkit/console?style=for-the-badge&label=OSSF%20Score)](https://api.securityscorecards.dev/projects/github.com/device-management-toolkit/console)
 [![Discord](https://img.shields.io/discord/1063200098680582154?style=for-the-badge&label=Discord&logo=discord&logoColor=white&labelColor=%235865F2&link=https%3A%2F%2Fdiscord.gg%2FDKHeUNEWVH)](https://discord.gg/DKHeUNEWVH)
 # Console
 
 
-> Disclaimer: Production viable releases are tagged and listed under 'Releases'. Console is under development. **The current available tags for download are Alpha version code and should not be used in production.** For these Alpha tags, certain features may not function yet, visual look and feel may change, or bugs/errors may occur. Follow along our [Feature Backlog for future releases and feature updates](https://github.com/orgs/open-amt-cloud-toolkit/projects/10).
+> Disclaimer: Production viable releases are tagged and listed under 'Releases'. Console is under development. **The current available tags for download are Alpha version code and should not be used in production.** For these Alpha tags, certain features may not function yet, visual look and feel may change, or bugs/errors may occur. Follow along our [Feature Backlog for future releases and feature updates](https://github.com/orgs/device-management-toolkit/projects/10).
 
 ## Overview
 
 Console is an application that provides a 1:1, direct connection for AMT devices for use in an enterprise environment. Users can add activated AMT devices to access device information and device management functionality such as power control, remote keyboard-video-mouse (KVM) control, and more.
 
-<!-- **For detailed documentation** about Getting Started or other features of the Open AMT Cloud Toolkit, see the [docs](https://open-amt-cloud-toolkit.github.io/docs). -->
-
 <br>
 
 ## Quick start 
 
 ### For Users
 
-1. Find the latest release of Console under [Github Releases](https://github.com/open-amt-cloud-toolkit/console/releases/latest).
+1. Find the latest release of Console under [Github Releases](https://github.com/device-management-toolkit/console/releases/latest).
 
 2. Download the appropriate binary assets for your OS and Architecture under the *Assets* dropdown section.
 
@@ -40,16 +38,12 @@ $ make run
 
 Download and check out the sample-web-ui:
 ```
-git clone https://github.com/open-amt-cloud-toolkit/sample-web-ui
+git clone https://github.com/device-management-toolkit/sample-web-ui
 ```
 
 Ensure that the environment file has cloud set to `false` and that the URLs for RPS and MPS are pointing to where you have `Console` running. The default is `http://localhost:8181`. Follow the instructions for launching and running the UI in the sample-web-ui readme.
 
 
-
-
-
-
 ## Dev tips for passing CI Checks
 
 - Install gofumpt `go install mvdan.cc/gofumpt@latest` (replaces gofmt)
@@ -63,12 +57,12 @@ Ensure that the environment file has cloud set to `false` and that the URLs for
 
 ## Additional Resources
 
-- For detailed documentation and Getting Started, [visit the docs site](https://open-amt-cloud-toolkit.github.io/docs).
+- For detailed documentation and Getting Started, [visit the docs site](https://device-management-toolkit.github.io/docs).
 
 <!-- - Looking to contribute? [Find more information here about contribution guidelines and practices](.\CONTRIBUTING.md). -->
 
-- Find a bug? Or have ideas for new features? [Open a new Issue](https://github.com/open-amt-cloud-toolkit/console/issues).
+- Find a bug? Or have ideas for new features? [Open a new Issue](https://github.com/device-management-toolkit/console/issues).
 
-- Need additional support or want to get the latest news and events about Open AMT? Connect with the team directly through Discord.
+- Need additional support or want to get the latest news and events about Device Management Toolkit? Connect with the team directly through Discord.
 
     [![Discord Banner 1](https://discordapp.com/api/guilds/1063200098680582154/widget.png?style=banner2)](https://discord.gg/DKHeUNEWVH)

cmd/app/main.go

@@ -7,10 +7,10 @@ import (
 	"os/exec"
 	"runtime"
 
-	"github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/security"
+	"github.com/device-management-toolkit/go-wsman-messages/v2/pkg/security"
 
-	"github.com/open-amt-cloud-toolkit/console/config"
-	"github.com/open-amt-cloud-toolkit/console/internal/app"
+	"github.com/device-management-toolkit/console/config"
+	"github.com/device-management-toolkit/console/internal/app"
 )
 
 // Function pointers for better testability.

cmd/app/main_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/open-amt-cloud-toolkit/console/config"
+	"github.com/device-management-toolkit/console/config"
 )
 
 type MockCommandExecutor struct {

config/config.go

@@ -60,17 +60,28 @@ type (
 		Password string `yaml:"password" env:"EA_PASSWORD"`
 	}
 
+	// Auth -.
 	Auth struct {
-		Disabled bool `yaml:"disabled" env:"AUTH_DISABLED"`
-		// BASIC
+		Disabled                 bool          `yaml:"disabled" env:"AUTH_DISABLED"`
 		AdminUsername            string        `yaml:"adminUsername" env:"AUTH_ADMIN_USERNAME"`
 		AdminPassword            string        `yaml:"adminPassword" env:"AUTH_ADMIN_PASSWORD"`
 		JWTKey                   string        `env-required:"true" yaml:"jwtKey" env:"AUTH_JWT_KEY"`
 		JWTExpiration            time.Duration `yaml:"jwtExpiration" env:"AUTH_JWT_EXPIRATION"`
 		RedirectionJWTExpiration time.Duration `yaml:"redirectionJWTExpiration" env:"AUTH_REDIRECTION_JWT_EXPIRATION"`
-		// OAUTH
-		ClientID string `yaml:"clientId" env:"AUTH_CLIENT_ID"`
-		Issuer   string `yaml:"issuer" env:"AUTH_ISSUER"`
+		ClientID                 string        `yaml:"clientId" env:"AUTH_CLIENT_ID"`
+		Issuer                   string        `yaml:"issuer" env:"AUTH_ISSUER"`
+		UI                       UIAuthConfig  `yaml:"ui"`
+	}
+
+	// UIAuthConfig -.
+	UIAuthConfig struct {
+		ClientID                          string `yaml:"clientId"`
+		Issuer                            string `yaml:"issuer"`
+		RedirectURI                       string `yaml:"redirectUri"`
+		Scope                             string `yaml:"scope"`
+		ResponseType                      string `yaml:"responseType"`
+		RequireHTTPS                      bool   `yaml:"requireHttps"`
+		StrictDiscoveryDocumentValidation bool   `yaml:"strictDiscoveryDocumentValidation"`
 	}
 )
 
@@ -80,7 +91,7 @@ func NewConfig() (*Config, error) {
 	ConsoleConfig = &Config{
 		App: App{
 			Name:                 "console",
-			Repo:                 "open-amt-cloud-toolkit/console",
+			Repo:                 "device-management-toolkit/console",
 			Version:              "DEVELOPMENT",
 			CommonName:           "localhost",
 			EncryptionKey:        "",
@@ -113,6 +124,15 @@ func NewConfig() (*Config, error) {
 			// OAUTH CONFIG, if provided will not use basic auth
 			ClientID: "",
 			Issuer:   "",
+			UI: UIAuthConfig{
+				ClientID:                          "",
+				Issuer:                            "",
+				RedirectURI:                       "",
+				Scope:                             "",
+				ResponseType:                      "",
+				RequireHTTPS:                      false,
+				StrictDiscoveryDocumentValidation: true,
+			},
 		},
 	}