6 Commits

Author SHA1 Message Date
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
d650c1437c chore(release): 1.0.4 [skip ci]
## [1.0.4](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.3...v1.0.4) (2024-03-08)

### Bug Fixes

* Include Mozilla CA certificate list for TLS trust ([72ed807](72ed8073bf))
2024-03-08 01:37:44 +00:00
87b97ea82e 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 26s
Container & Helm chart / Helm chart (push) Successful in 15s
Container & Helm chart / Container image (push) Successful in 5m24s
Container & Helm chart / Semantic Release (push) Successful in 28s
2024-03-08 12:31:19 +11:00
72ed8073bf fix: Include Mozilla CA certificate list for TLS trust 2024-03-08 12:31:17 +11:00
5 changed files with 43 additions and 12 deletions

View File

@ -1,3 +1,17 @@
## [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)
### Bug Fixes
* Include Mozilla CA certificate list for TLS trust ([72ed807](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/commit/72ed8073bf65a04efc68a4de28f5319b3931f6bc))
## [1.0.3](http://gitea.gitea.svc.cluster.local:3000/djpbessems/ContainerImage.SpamasaurusRex/compare/v1.0.2...v1.0.3) (2024-03-08)

View File

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

3
go.mod
View File

@ -3,12 +3,13 @@ module pkg/spamasaurusrex
go 1.19
require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1
github.com/breml/rootcerts v0.2.16
github.com/gorilla/mux v1.8.1
github.com/microsoftgraph/msgraph-sdk-go v1.34.0
)
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/kylelemons/godebug v1.1.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect

2
go.sum
View File

@ -6,6 +6,8 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aM
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA=
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/breml/rootcerts v0.2.16 h1:yN1TGvicfHx8dKz3OQRIrx/5nE/iN3XT1ibqGbd6urc=
github.com/breml/rootcerts v0.2.16/go.mod h1:S/PKh+4d1HUn4HQovEB8hPJZO6pUZYrIhmXBhsegfXw=
github.com/cjlapao/common-go v0.0.39 h1:bAAUrj2B9v0kMzbAOhzjSmiyDy+rd56r2sy7oEiQLlA=
github.com/cjlapao/common-go v0.0.39/go.mod h1:M3dzazLjTjEtZJbbxoA5ZDiGCiHmpwqW9l4UWaddwOA=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

View File

@ -11,24 +11,39 @@ import (
"syscall"
"time"
_ "github.com/breml/rootcerts"
"github.com/gorilla/mux"
"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
)
func handler(w http.ResponseWriter, r *http.Request) {
graphHelper := graphhelper.NewGraphHelper()
initializeGraph(graphHelper)
clientId := "dccb4b93-3f75-4775-a94a-da39216d7daf"
tenantId := "ceeae22e-f163-4ac9-b7c2-45972d3aed4f"
// redirectURI := "https://alias.spamasaurus.com/"
scopes := []string{"email"}
user, err := graphHelper.GetUser()
// confidential clients have a credential, such as a secret or a certificate
cred, err := confidential.NewCredFromSecret("client_secret")
if err != nil {
log.Panicf("Error getting user: %v\n", err)
// TODO: handle error
}
fmt.Printf("Hello, %s!\n", *user.GetDisplayName())
w.Write([]byte(fmt.Sprintf("Hello, %s\n", *user.GetDisplayName())))
confidentialClient, err := confidential.New("https://login.microsoftonline.com/" + tenantId, clientId, cred)
if err != nil {
// TODO: handle error
}
// query := r.URL.Query()
// name := query.Get("name")
// w.Write([]byte(fmt.Sprintf("Hello, %s\n", name)))
result, err := confidentialClient.AcquireTokenSilent(context.TODO(), scopes)
if err != nil {
// cache miss, authenticate with another AcquireToken... method
result, err = confidentialClient.AcquireTokenByCredential(context.TODO(), scopes)
if err != nil {
// TODO: handle error
}
}
// accessToken := result.AccessToken
w.Write([]byte(fmt.Sprintf("Hello, %s\n", result.AccessToken)))
}
func healthHandler(w http.ResponseWriter, r *http.Request) {
@ -49,7 +64,6 @@ func readinessHandler(w http.ResponseWriter, r *http.Request) {
}
func main() {
// Create Server and Route Handlers
r := mux.NewRouter()
r.HandleFunc("/", handler)