17 Commits

Author SHA1 Message Date
d864e11320 chore(release): 1.0.9 [skip ci]
## [1.0.9](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.8...v1.0.9) (2024-03-09)

### Bug Fixes

* Refactor to different client method ([216c955](216c955e68))
2024-03-09 11:41:29 +00:00
907fc9249c chore: Revert action extra_args
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 24s
Container & Helm chart / Helm chart (push) Successful in 22s
Container & Helm chart / Container image (push) Successful in 10m39s
Container & Helm chart / Semantic Release (push) Successful in 33s
2024-03-09 22:29:45 +11:00
4adb8cd382 Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
Some checks failed
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 29s
Container & Helm chart / Container image (push) Failing after 6s
Container & Helm chart / Helm chart (push) Successful in 16s
Container & Helm chart / Semantic Release (push) Has been skipped
2024-03-09 22:25:37 +11:00
216c955e68 fix: Refactor to different client method 2024-03-09 22:25:35 +11:00
d38686dc01 chore: Switch to verbose output for go build 2024-03-09 22:25:20 +11:00
f787b14939 chore(release): 1.0.8 [skip ci]
## [1.0.8](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.7...v1.0.8) (2024-03-09)

### Bug Fixes

* Replace bogus scope with correct value ([44bf4e4](44bf4e4888))
2024-03-09 11:08:48 +00:00
e232eb7d8d Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 29s
Container & Helm chart / Helm chart (push) Successful in 16s
Container & Helm chart / Container image (push) Successful in 8m46s
Container & Helm chart / Semantic Release (push) Successful in 34s
2024-03-09 21:58:57 +11:00
44bf4e4888 fix: Replace bogus scope with correct value 2024-03-09 21:58:56 +11:00
a7dedbe6db chore(release): 1.0.7 [skip ci]
## [1.0.7](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.6...v1.0.7) (2024-03-09)

### Bug Fixes

* Expand scope of debugging variable ([3dbfb4a](3dbfb4a917))
2024-03-09 07:20:14 +00:00
f02370d5bc Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 24s
Container & Helm chart / Helm chart (push) Successful in 15s
Container & Helm chart / Container image (push) Successful in 9m44s
Container & Helm chart / Semantic Release (push) Successful in 32s
2024-03-09 18:09:28 +11:00
3dbfb4a917 fix: Expand scope of debugging variable 2024-03-09 18:09:26 +11:00
ddb220a889 chore(release): 1.0.6 [skip ci]
## [1.0.6](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.5...v1.0.6) (2024-03-09)

### Bug Fixes

* Add verbose debugging output ([b4d866b](b4d866bbe8))
2024-03-09 07:07:01 +00:00
ddbc209324 Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 32s
Container & Helm chart / Helm chart (push) Successful in 16s
Container & Helm chart / Container image (push) Successful in 9m3s
Container & Helm chart / Semantic Release (push) Successful in 33s
2024-03-09 17:56:49 +11:00
b4d866bbe8 fix: Add verbose debugging output 2024-03-09 17:56:47 +11:00
4f14b47137 chore(release): 1.0.5 [skip ci]
## [1.0.5](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.4...v1.0.5) (2024-03-08)

### Bug Fixes

* Rebase to MSAL library for authentication ([3a0c288](3a0c288e55))
2024-03-08 08:29:55 +00:00
905f2aed8e Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.SpamasaurusRex
All checks were successful
Container & Helm chart / Semantic Release (Dry-run) (push) Successful in 27s
Container & Helm chart / Helm chart (push) Successful in 15s
Container & Helm chart / Container image (push) Successful in 4m36s
Container & Helm chart / Semantic Release (push) Successful in 29s
2024-03-08 19:24:21 +11:00
3a0c288e55 fix: Rebase to MSAL library for authentication 2024-03-08 19:24:19 +11:00
5 changed files with 68 additions and 13 deletions

View File

@ -54,6 +54,7 @@ jobs:
- name: Kaniko build - name: Kaniko build
uses: aevea/action-kaniko@master uses: aevea/action-kaniko@master
with: with:
# extra_args: -v debug
registry: code.spamasaurus.com registry: code.spamasaurus.com
image: djpbessems/spamasaurusrex image: djpbessems/spamasaurusrex
username: ${{ secrets.GIT_USERNAME }} username: ${{ secrets.GIT_USERNAME }}

View File

@ -1,3 +1,38 @@
## [1.0.9](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.8...v1.0.9) (2024-03-09)
### Bug Fixes
* Refactor to different client method ([216c955](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/216c955e68908d523a84cafd6cf182f9583e104e))
## [1.0.8](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.7...v1.0.8) (2024-03-09)
### Bug Fixes
* Replace bogus scope with correct value ([44bf4e4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/44bf4e4888738afebd28ad717153113753afd5f2))
## [1.0.7](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.6...v1.0.7) (2024-03-09)
### Bug Fixes
* Expand scope of debugging variable ([3dbfb4a](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/3dbfb4a917fa5f886c52f0ae11c1cab73ecb7713))
## [1.0.6](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.5...v1.0.6) (2024-03-09)
### Bug Fixes
* Add verbose debugging output ([b4d866b](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/b4d866bbe8cf3f9632fdf69de4f15779c0099a9f))
## [1.0.5](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.4...v1.0.5) (2024-03-08)
### Bug Fixes
* Rebase to MSAL library for authentication ([3a0c288](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/3a0c288e55d4a717fa89f9548c5006e6c6bd7969))
## [1.0.4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.3...v1.0.4) (2024-03-08) ## [1.0.4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.3...v1.0.4) (2024-03-08)

View File

@ -14,6 +14,6 @@ WORKDIR /app
COPY --from=builder /app/main . COPY --from=builder /app/main .
EXPOSE 80 EXPOSE 8080
CMD ["./main"] CMD ["./main"]

4
go.mod
View File

@ -3,13 +3,13 @@ module pkg/spamasaurusrex
go 1.19 go 1.19
require ( require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1
github.com/breml/rootcerts v0.2.16 github.com/breml/rootcerts v0.2.16
github.com/gorilla/mux v1.8.1 github.com/gorilla/mux v1.8.1
github.com/microsoftgraph/msgraph-sdk-go v1.34.0 github.com/microsoftgraph/msgraph-sdk-go v1.34.0
) )
require ( require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@ -22,7 +22,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
github.com/cjlapao/common-go v0.0.39 // indirect github.com/cjlapao/common-go v0.0.39 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1
github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/uuid v1.6.0 // indirect github.com/google/uuid v1.6.0 // indirect

View File

@ -13,23 +13,42 @@ import (
_ "github.com/breml/rootcerts" _ "github.com/breml/rootcerts"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/davecgh/go-spew/spew"
"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
) )
func handler(w http.ResponseWriter, r *http.Request) { func handler(w http.ResponseWriter, r *http.Request) {
graphHelper := graphhelper.NewGraphHelper() clientId := "dccb4b93-3f75-4775-a94a-da39216d7daf"
initializeGraph(graphHelper) tenantId := "ceeae22e-f163-4ac9-b7c2-45972d3aed4f"
redirectURI := "https://alias.spamasaurus.com/"
scopes := []string{"user.read"}
queryParams := r.URL.Query()
user, err := graphHelper.GetUser() ctx := context.Background()
// confidential clients have a credential, such as a secret or a certificate
cred, err := confidential.NewCredFromSecret("client_secret")
if err != nil { if err != nil {
log.Panicf("Error getting user: %v\n", err) // TODO: handle error
}
confidentialClient, err := confidential.New("https://login.microsoftonline.com/"+tenantId, clientId, cred)
if err != nil {
// TODO: handle error
} }
fmt.Printf("Hello, %s!\n", *user.GetDisplayName()) result, err := confidentialClient.AcquireTokenSilent(ctx, scopes)
w.Write([]byte(fmt.Sprintf("Hello, %s\n", *user.GetDisplayName()))) if err != nil {
// cache miss, authenticate with another AcquireToken... method
// query := r.URL.Query() // result, err = confidentialClient.AcquireTokenByCredential(ctx, scopes)
// name := query.Get("name") result, err = confidentialClient.AcquireTokenByAuthCode(ctx, queryParams["code"][0], redirectURI, scopes)
// w.Write([]byte(fmt.Sprintf("Hello, %s\n", name))) if err != nil {
// TODO: handle error
}
}
// accessToken := result.AccessToken
w.Write([]byte(fmt.Sprintf("Hello, %s\n", spew.Sdump(result))))
} }
func healthHandler(w http.ResponseWriter, r *http.Request) { func healthHandler(w http.ResponseWriter, r *http.Request) {