extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-21 23:53:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

working, tested verify endpoint (#50)

Browse Source
This commit is contained in:
Michael Quigley 2022-09-19 16:26:54 -04:00
parent 08aba670ab
commit 6190ac0c60
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
10 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
controller/account.go
View File

@ -68,6 +68,25 @@ func (self *createAccountHandler) handleVerifiedCreate(params identity.CreateAcc
logrus.Error(err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
ar := &store.AccountRequest{
Token: token,
Email: params.Body.Email,
SourceAddress: params.HTTPRequest.RemoteAddr,
}
tx, err := str.Begin()
if err != nil {
logrus.Error(err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
defer func() { _ = tx.Rollback() }()
if _, err := str.CreateAccountRequest(ar, tx); err != nil {
logrus.Error(err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
if err := tx.Commit(); err != nil {
logrus.Error(err)
return identity.NewCreateAccountInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
return identity.NewCreateAccountCreated()
}

3
controller/store/account_request.go
View File

@ -1,7 +1,6 @@
package store
import (
"database/sql"
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"
)
@ -14,7 +13,7 @@ type AccountRequest struct {
SourceAddress string
}
func (self *Store) CreateAccountRequest(ar *AccountRequest, tx *sql.Tx) (int, error) {
func (self *Store) CreateAccountRequest(ar *AccountRequest, tx *sqlx.Tx) (int, error) {
stmt, err := tx.Prepare("insert into account_requests (token, email, source_address) values (?, ?, ?)")
if err != nil {
return 0, errors.Wrap(err, "error preparing account_requests insert statement")

27
controller/verify.go
View File

@ -16,16 +16,21 @@ func newVerifyHandler(cfg *Config) *verifyHandler {
}
func (self *verifyHandler) Handle(params identity.VerifyParams) middleware.Responder {
logrus.Infof("received verify request for token '%v'", params.Body.Token)
tx, err := str.Begin()
if err != nil {
logrus.Errorf("error starting transaction: %v", err)
return identity.NewVerifyInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
if params.Body != nil {
logrus.Infof("received verify request for token '%v'", params.Body.Token)
tx, err := str.Begin()
if err != nil {
logrus.Errorf("error starting transaction: %v", err)
return identity.NewVerifyInternalServerError().WithPayload(rest_model_zrok.ErrorMessage(err.Error()))
}
ar, err := str.FindAccountRequestWithToken(params.Body.Token, tx)
if err != nil {
logrus.Errorf("error finding account with token '%v': %v", params.Body.Token, err)
return identity.NewVerifyNotFound()
}
return identity.NewVerifyOK().WithPayload(&rest_model_zrok.VerifyResponse{Email: ar.Email})
} else {
logrus.Error("empty verification request")
return identity.NewVerifyInternalServerError().WithPayload(rest_model_zrok.ErrorMessage("empty verification request"))
}
ar, err := str.FindAccountRequestWithToken(params.Body.Token, tx)
if err != nil {
logrus.Errorf("error finding account with token '%v': %v", params.Body.Token, err)
return identity.NewVerifyNotFound()
}
return identity.NewVerifyOK().WithPayload(&rest_model_zrok.VerifyResponse{Email: ar.Email})
}

2
rest_client_zrok/identity/identity_client.go
View File

@ -207,7 +207,7 @@ func (a *Client) Verify(params *VerifyParams, opts ...ClientOption) (*VerifyOK,
}
op := &runtime.ClientOperation{
ID: "verify",
Method: "GET",
Method: "POST",
PathPattern: "/verify",
ProducesMediaTypes: []string{"application/zrok.v1+json"},
ConsumesMediaTypes: []string{"application/zrok.v1+json"},

12
rest_client_zrok/identity/verify_responses.go
View File

@ -86,11 +86,11 @@ func (o *VerifyOK) IsCode(code int) bool {
}
func (o *VerifyOK) Error() string {
return fmt.Sprintf("[GET /verify][%d] verifyOK %+v", 200, o.Payload)
return fmt.Sprintf("[POST /verify][%d] verifyOK %+v", 200, o.Payload)
}
func (o *VerifyOK) String() string {
return fmt.Sprintf("[GET /verify][%d] verifyOK %+v", 200, o.Payload)
return fmt.Sprintf("[POST /verify][%d] verifyOK %+v", 200, o.Payload)
}
func (o *VerifyOK) GetPayload() *rest_model_zrok.VerifyResponse {
@ -148,11 +148,11 @@ func (o *VerifyNotFound) IsCode(code int) bool {
}
func (o *VerifyNotFound) Error() string {
return fmt.Sprintf("[GET /verify][%d] verifyNotFound ", 404)
return fmt.Sprintf("[POST /verify][%d] verifyNotFound ", 404)
}
func (o *VerifyNotFound) String() string {
return fmt.Sprintf("[GET /verify][%d] verifyNotFound ", 404)
return fmt.Sprintf("[POST /verify][%d] verifyNotFound ", 404)
}
func (o *VerifyNotFound) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
@ -200,11 +200,11 @@ func (o *VerifyInternalServerError) IsCode(code int) bool {
}
func (o *VerifyInternalServerError) Error() string {
return fmt.Sprintf("[GET /verify][%d] verifyInternalServerError %+v", 500, o.Payload)
return fmt.Sprintf("[POST /verify][%d] verifyInternalServerError %+v", 500, o.Payload)
}
func (o *VerifyInternalServerError) String() string {
return fmt.Sprintf("[GET /verify][%d] verifyInternalServerError %+v", 500, o.Payload)
return fmt.Sprintf("[POST /verify][%d] verifyInternalServerError %+v", 500, o.Payload)
}
func (o *VerifyInternalServerError) GetPayload() rest_model_zrok.ErrorMessage {

4
rest_server_zrok/embedded_spec.go
View File

@ -287,7 +287,7 @@ func init() {
}
},
"/verify": {
"get": {
"post": {
"tags": [
"identity"
],
@ -844,7 +844,7 @@ func init() {
}
},
"/verify": {
"get": {
"post": {
"tags": [
"identity"
],

2
rest_server_zrok/operations/identity/verify.go
View File

@ -30,7 +30,7 @@ func NewVerify(ctx *middleware.Context, handler VerifyHandler) *Verify {
}
/*
Verify swagger:route GET /verify identity verify
Verify swagger:route POST /verify identity verify
Verify verify API
*/

6
rest_server_zrok/operations/zrok_api.go
View File

@ -377,10 +377,10 @@ func (o *ZrokAPI) initHandlerCache() {
o.handlers["DELETE"] = make(map[string]http.Handler)
}
o.handlers["DELETE"]["/untunnel"] = tunnel.NewUntunnel(o.context, o.TunnelUntunnelHandler)
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)
if o.handlers["POST"] == nil {
o.handlers["POST"] = make(map[string]http.Handler)
}
o.handlers["GET"]["/verify"] = identity.NewVerify(o.context, o.IdentityVerifyHandler)
o.handlers["POST"]["/verify"] = identity.NewVerify(o.context, o.IdentityVerifyHandler)
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)
}

2
specs/zrok.yml
View File

@ -169,7 +169,7 @@ paths:
$ref: "#/definitions/errorMessage"
/verify:
get:
post:
tags:
- identity
operationId: verify

2
ui/src/api/identity.js
View File

@ -114,5 +114,5 @@ const loginOperation = {
const verifyOperation = {
path: '/verify',
contentTypes: ['application/zrok.v1+json'],
method: 'get'
method: 'post'
}