Merge pull request #17 from zachmann/fed_entity

Fed entity

examples/rp/server.go

@@ -185,8 +185,7 @@ var redirectURI string
 func handleEntityConfiguration(w http.ResponseWriter, r *http.Request) {
  var err error
 
- c := fedLeaf().EntityConfiguration()
- jwt, err := c.JWT()
+ jwt, err := fedLeaf().EntityConfigurationJWT()
  if err != nil {
  log.Fatal(err)
  }

examples/ta/config/config.go

@@ -8,6 +8,7 @@ import (
  "gopkg.in/yaml.v3"
 
  "github.com/zachmann/go-oidfed/pkg"
+ "github.com/zachmann/go-oidfed/pkg/fedentities"
 )
 
 type Config struct {
@@ -20,6 +21,15 @@ type Config struct {
  ConfigurationLifetime int64 `yaml:"configuration_lifetime"`
  OrganizationName string `yaml:"organization_name"`
  DataLocation string `yaml:"data_location"`
+ ReadableStorage bool `yaml:"human_readable_storage"`
+ Endpoints Endpoints `yaml:"endpoints"`
+}
+
+type Endpoints struct {
+ FetchEndpoint fedentities.EndpointConf `yaml:"fetch"`
+ ListEndpoint fedentities.EndpointConf `yaml:"list"`
+ ResolveEndpoint fedentities.EndpointConf `yaml:"resolve"`
+ //TODO
 }
 
 var c Config
@@ -50,13 +60,14 @@ func Load(filename string) {
  }
  if c.MetadataPolicyFile == "" {
  log.Println("WARNING: metadata_policy_file not set")
- }
- policyContent, err := os.ReadFile(c.MetadataPolicyFile)
- if err != nil {
- log.Fatal(err)
- }
- if err = json.Unmarshal(policyContent, &c.MetadataPolicy); err != nil {
- log.Fatal(err)
+ } else {
+ policyContent, err := os.ReadFile(c.MetadataPolicyFile)
+ if err != nil {
+ log.Fatal(err)
+ }
+ if err = json.Unmarshal(policyContent, &c.MetadataPolicy); err != nil {
+ log.Fatal(err)
+ }
  }
 
 }

examples/ta/go.mod

@@ -3,10 +3,8 @@ module github.com/zachmann/go-oidfed/examples/ta
 go 1.22
 
 require (
- github.com/gofiber/fiber/v2 v2.48.0
  github.com/golang-jwt/jwt v3.2.2+incompatible
  github.com/lestrrat-go/jwx v1.2.27
- github.com/pkg/errors v0.9.1
  gopkg.in/yaml.v3 v3.0.1
 )
 

examples/ta/oidfed/jws.go → examples/ta/jws.go

@@ -1,4 +1,4 @@
-package oidfed
+package main
 
 import (
  "crypto"
@@ -15,8 +15,15 @@ import (
  "github.com/lestrrat-go/jwx/jwk"
 
  "github.com/zachmann/go-oidfed/examples/ta/config"
+ "github.com/zachmann/go-oidfed/internal/jwx"
 )
 
+func genJWKS() jwk.Set {
+ sk := mustNewKey()
+ jwks := jwx.KeyToJWKS(sk.Public(), jwa.ES512)
+ return jwks
+}
+
 func mustNewKey() *ecdsa.PrivateKey {
  sk, err := ecdsa.GenerateKey(elliptic.P521(), rand.Reader)
  if err != nil {

examples/ta/main.go

@@ -1,12 +1,17 @@
 package main
 
 import (
+ "fmt"
+ "log"
+ "net/http"
  "os"
 
+ "github.com/lestrrat-go/jwx/jwa"
+
  "github.com/zachmann/go-oidfed/examples/ta/config"
- "github.com/zachmann/go-oidfed/examples/ta/oidfed"
- "github.com/zachmann/go-oidfed/examples/ta/server"
- "github.com/zachmann/go-oidfed/examples/ta/server/routes"
+ "github.com/zachmann/go-oidfed/pkg"
+ "github.com/zachmann/go-oidfed/pkg/fedentities"
+ "github.com/zachmann/go-oidfed/pkg/fedentities/storage"
 )
 
 func main() {
@@ -15,8 +20,76 @@ func main() {
  configFile = os.Args[1]
  }
  config.Load(configFile)
- routes.Init()
- oidfed.Init()
- server.Init()
- server.Start()
+ log.Println("Loaded Config")
+ c := config.Get()
+ initKey()
+ log.Println("Loaded signing key")
+
+ var subordinateStorage storage.SubordinateStorageBackend
+ if c.ReadableStorage {
+ warehouse := storage.NewFileStorage(c.DataLocation)
+ subordinateStorage = warehouse.SubordinateStorage()
+ } else {
+ warehouse, err := storage.NewBadgerStorage(c.DataLocation)
+ if err != nil {
+ log.Fatal(err)
+ }
+ subordinateStorage = warehouse.SubordinateStorage()
+ }
+ log.Println("Loaded storage backend")
+
+ entity, err := fedentities.NewFedEntity(
+ c.EntityID, c.AuthorityHints,
+ &pkg.Metadata{
+ FederationEntity: &pkg.FederationEntityMetadata{
+ CommonMetadata: pkg.CommonMetadata{
+ OrganizationName: c.OrganizationName,
+ },
+ },
+ },
+ signingKey, jwa.ES512, c.ConfigurationLifetime, fedentities.SubordinateStatementsConfig{
+ MetadataPolicies: nil,
+ Configs: map[string]*fedentities.SubordinateStatementTypeConfig{
+ "": {
+ SubordinateStatementLifetime: 3600,
+ // TODO read all of this from config or a storage backend
+ },
+ },
+ },
+ )
+ if err != nil {
+ panic(err)
+ }
+ entity.MetadataPolicies = c.MetadataPolicy
+ // TODO other constraints etc.
+ log.Println("Initialized Entity")
+
+ entity.AddFetchEndpoint(c.Endpoints.FetchEndpoint, subordinateStorage)
+ entity.AddSubordinateListingEndpoint(c.Endpoints.ListEndpoint, subordinateStorage)
+ entity.AddResolveEndpoint(c.Endpoints.ResolveEndpoint)
+ log.Println("Added Endpoints")
+
+ // subordinateStorage.Write(
+ // "https://op.example.org", storage.SubordinateInfo{
+ // JWKS: genJWKS(),
+ // EntityType: constants.EntityTypeOpenIDProvider,
+ // EntityID: "https://op.example.org",
+ // },
+ // )
+ // subordinateStorage.Write(
+ // "https://rp.example.org", storage.SubordinateInfo{
+ // JWKS: genJWKS(),
+ // EntityType: constants.EntityTypeOpenIDRelyingParty,
+ // EntityID: "https://rp.example.org",
+ // },
+ // )
+
+ log.Printf("Start serving on port %d\n", c.ServerPort)
+ if err = http.ListenAndServe(fmt.Sprintf(":%d", c.ServerPort), entity.HttpHandlerFunc()); err != nil {
+ panic(err)
+ }
+ // if err = entity.Listen(fmt.Sprintf(":%d", c.ServerPort)); err != nil {
+ // panic(err)
+ // }
+
 }