fixes #113 #112 and fixes enrollment request payloads

openziti · Jun 5, 2024 · 153d6d3 · 153d6d3
1 parent d35e418
commit 153d6d3
Show file tree

Hide file tree

Showing 31 changed files with 673 additions and 441 deletions.
diff --git a/client.yml b/client.yml
@@ -1621,9 +1621,9 @@ paths:
         in: header
       responses:
         "200":
-          description: Base empty response
+          description: The recovery codes of an MFA enrollment
           schema:
-            $ref: '#/definitions/empty'
+            $ref: '#/definitions/detailMfaRecoveryCodesEnvelope'
         "401":
           description: The supplied session does not have the correct access rights
             to request this resource
@@ -1682,9 +1682,9 @@ paths:
           $ref: '#/definitions/mfaCode'
       responses:
         "200":
-          description: The recovery codes of an MFA enrollment
+          description: Base empty response
           schema:
-            $ref: '#/definitions/detailMfaRecoveryCodesEnvelope'
+            $ref: '#/definitions/empty'
         "401":
           description: The supplied session does not have the correct access rights
             to request this resource
@@ -2004,11 +2004,12 @@ paths:
                 apiEnrollmentVersion: 0.0.1
                 apiVersion: 0.0.1
     parameters:
-    - type: string
-      format: uuid
-      name: token
-      in: query
+    - description: An OTT enrollment request
+      name: erOttEnrollmentRequest
+      in: body
       required: true
+      schema:
+        $ref: '#/definitions/erOttEnrollmentRequest'
   /enroll/extend/router:
     post:
       description: |
@@ -2142,11 +2143,12 @@ paths:
                 apiEnrollmentVersion: 0.0.1
                 apiVersion: 0.0.1
     parameters:
-    - type: string
-      format: uuid
-      name: token
-      in: query
+    - description: An OTT enrollment request
+      name: ottEnrollmentRequest
+      in: body
       required: true
+      schema:
+        $ref: '#/definitions/ottEnrollmentRequest'
   /enroll/ottca:
     post:
       description: |
@@ -2184,11 +2186,12 @@ paths:
                 apiEnrollmentVersion: 0.0.1
                 apiVersion: 0.0.1
     parameters:
-    - type: string
-      format: uuid
-      name: token
-      in: query
+    - description: An OTT enrollment request
+      name: ottEnrollmentRequest
+      in: body
       required: true
+      schema:
+        $ref: '#/definitions/ottEnrollmentRequest'
   /enroll/updb:
     post:
       description: |
@@ -4269,9 +4272,9 @@ definitions:
     type: object
     required:
     - meta
-    - error
+    - data
     properties:
-      error:
+      data:
         $ref: '#/definitions/detailMfaRecoveryCodes'
       meta:
         $ref: '#/definitions/meta'
@@ -4389,6 +4392,15 @@ definitions:
       osVersion:
         type: string
         maxLength: 255
+  erOttEnrollmentRequest:
+    type: object
+    properties:
+      clientCsr:
+        type: string
+      serverCsr:
+        type: string
+      token:
+        type: string
   identityAuthenticators:
     type: object
     properties:
@@ -4841,10 +4853,7 @@ definitions:
     required:
     - nonce
     - keyId
-    - algorithm
     properties:
-      algorithm:
-        type: string
       keyId:
         type: string
       nonce:
@@ -4854,9 +4863,14 @@ definitions:
     type: object
     required:
     - signature
+    - algorithm
+    - kid
+    - caPool
     properties:
       algorithm:
         type: string
+      caPool:
+        type: string
       kid:
         type: string
       signature:
@@ -4882,6 +4896,13 @@ definitions:
       t:
         description: Factor CRT coefficient.
         type: string
+  ottEnrollmentRequest:
+    type: object
+    properties:
+      clientCsr:
+        type: string
+      token:
+        type: string
   pagination:
     type: object
     required:

diff --git a/go.mod b/go.mod
@@ -16,13 +16,13 @@ require (
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
-	golang.org/x/net v0.25.0
+	golang.org/x/net v0.26.0
 )
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.23.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -34,10 +34,10 @@ require (
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	go.mongodb.org/mongo-driver v1.15.0 // indirect
-	go.opentelemetry.io/otel v1.26.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	go.opentelemetry.io/otel v1.27.0 // indirect
+	go.opentelemetry.io/otel/metric v1.27.0 // indirect
+	go.opentelemetry.io/otel/trace v1.27.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU=
@@ -67,22 +67,22 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc=
 go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
+go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
+go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
+go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik=
+go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
 go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
 go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
+go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

diff --git a/management.yml b/management.yml
@@ -4563,9 +4563,9 @@ paths:
         in: header
       responses:
         "200":
-          description: Base empty response
+          description: The recovery codes of an MFA enrollment
           schema:
-            $ref: '#/definitions/empty'
+            $ref: '#/definitions/detailMfaRecoveryCodesEnvelope'
         "401":
           description: The supplied session does not have the correct access rights
             to request this resource
@@ -4624,9 +4624,9 @@ paths:
           $ref: '#/definitions/mfaCode'
       responses:
         "200":
-          description: The recovery codes of an MFA enrollment
+          description: Base empty response
           schema:
-            $ref: '#/definitions/detailMfaRecoveryCodesEnvelope'
+            $ref: '#/definitions/empty'
         "401":
           description: The supplied session does not have the correct access rights
             to request this resource
@@ -16840,9 +16840,9 @@ definitions:
     type: object
     required:
     - meta
-    - error
+    - data
     properties:
-      error:
+      data:
         $ref: '#/definitions/detailMfaRecoveryCodes'
       meta:
         $ref: '#/definitions/meta'

diff --git a/rest_client_api_client/current_identity/create_mfa_recovery_codes_responses.go b/rest_client_api_client/current_identity/create_mfa_recovery_codes_responses.go
diff --git a/rest_client_api_client/current_identity/detail_mfa_recovery_codes_responses.go b/rest_client_api_client/current_identity/detail_mfa_recovery_codes_responses.go
diff --git a/rest_client_api_client/enroll/enroll_er_ott_parameters.go b/rest_client_api_client/enroll/enroll_er_ott_parameters.go