commit 8f8a47fd806ba278acc664fd2985c80f1cc85868 · hailey.at/atproto-oauth-golang

+229

cmd/client_test/handle_auth.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"encoding/json"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"net/url"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       9
       9
       +
       	"github.com/gorilla/sessions"

     

       10
       10
       +
       	oauth "github.com/haileyok/atproto-oauth-golang"

     

       11
       11
       +
       	"github.com/labstack/echo-contrib/session"

     

       12
       12
       +
       	"github.com/labstack/echo/v4"

     

       13
       13
       +
       	"gorm.io/gorm/clause"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       func (s *TestServer) handleLoginSubmit(e echo.Context) error {

     

       17
       17
       +
       	handle := e.FormValue("handle")

     

       18
       18
       +
       	if handle == "" {

     

       19
       19
       +
       		return e.Redirect(302, "/login?e=handle-empty")

     

       20
       20
       +
       	}

     

       21
       21
       +
       

     

       22
       22
       +
       	_, herr := syntax.ParseHandle(handle)

     

       23
       23
       +
       	_, derr := syntax.ParseDID(handle)

     

       24
       24
       +
       

     

       25
       25
       +
       	if herr != nil && derr != nil {

     

       26
       26
       +
       		return e.Redirect(302, "/login?e=handle-invalid")

     

       27
       27
       +
       	}

     

       28
       28
       +
       

     

       29
       29
       +
       	var did string

     

       30
       30
       +
       

     

       31
       31
       +
       	if derr == nil {

     

       32
       32
       +
       		did = handle

     

       33
       33
       +
       	} else {

     

       34
       34
       +
       		maybeDid, err := resolveHandle(e.Request().Context(), handle)

     

       35
       35
       +
       		if err != nil {

     

       36
       36
       +
       			return err

     

       37
       37
       +
       		}

     

       38
       38
       +
       

     

       39
       39
       +
       		did = maybeDid

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	service, err := resolveService(ctx, did)

     

       43
       43
       +
       	if err != nil {

     

       44
       44
       +
       		return err

     

       45
       45
       +
       	}

     

       46
       46
       +
       

     

       47
       47
       +
       	authserver, err := s.oauthClient.ResolvePDSAuthServer(ctx, service)

     

       48
       48
       +
       	if err != nil {

     

       49
       49
       +
       		return err

     

       50
       50
       +
       	}

     

       51
       51
       +
       

     

       52
       52
       +
       	meta, err := s.oauthClient.FetchAuthServerMetadata(ctx, authserver)

     

       53
       53
       +
       	if err != nil {

     

       54
       54
       +
       		return err

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	dpopPrivateKey, err := oauth.GenerateKey(nil)

     

       58
       58
       +
       	if err != nil {

     

       59
       59
       +
       		return err

     

       60
       60
       +
       	}

     

       61
       61
       +
       

     

       62
       62
       +
       	dpopPrivateKeyJson, err := json.Marshal(dpopPrivateKey)

     

       63
       63
       +
       	if err != nil {

     

       64
       64
       +
       		return err

     

       65
       65
       +
       	}

     

       66
       66
       +
       

     

       67
       67
       +
       	parResp, err := s.oauthClient.SendParAuthRequest(

     

       68
       68
       +
       		ctx,

     

       69
       69
       +
       		authserver,

     

       70
       70
       +
       		meta,

     

       71
       71
       +
       		"",

     

       72
       72
       +
       		scope,

     

       73
       73
       +
       		dpopPrivateKey,

     

       74
       74
       +
       	)

     

       75
       75
       +
       

     

       76
       76
       +
       	oauthRequest := &OauthRequest{

     

       77
       77
       +
       		State:               parResp.State,

     

       78
       78
       +
       		AuthserverIss:       meta.Issuer,

     

       79
       79
       +
       		Did:                 did,

     

       80
       80
       +
       		PdsUrl:              service,

     

       81
       81
       +
       		PkceVerifier:        parResp.PkceVerifier,

     

       82
       82
       +
       		DpopAuthserverNonce: parResp.DpopAuthserverNonce,

     

       83
       83
       +
       		DpopPrivateJwk:      string(dpopPrivateKeyJson),

     

       84
       84
       +
       	}

     

       85
       85
       +
       

     

       86
       86
       +
       	if err := s.db.Create(oauthRequest).Error; err != nil {

     

       87
       87
       +
       		return err

     

       88
       88
       +
       	}

     

       89
       89
       +
       

     

       90
       90
       +
       	u, _ := url.Parse(meta.AuthorizationEndpoint)

     

       91
       91
       +
       	u.RawQuery = fmt.Sprintf(

     

       92
       92
       +
       		"client_id=%s&request_uri=%s",

     

       93
       93
       +
       		url.QueryEscape(serverMetadataUrl),

     

       94
       94
       +
       		parResp.Resp["request_uri"].(string),

     

       95
       95
       +
       	)

     

       96
       96
       +
       

     

       97
       97
       +
       	sess, err := session.Get("session", e)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return err

     

       100
       100
       +
       	}

     

       101
       101
       +
       

     

       102
       102
       +
       	sess.Options = &sessions.Options{

     

       103
       103
       +
       		Path:     "/",

     

       104
       104
       +
       		MaxAge:   300, // save for five minutes

     

       105
       105
       +
       		HttpOnly: true,

     

       106
       106
       +
       	}

     

       107
       107
       +
       

     

       108
       108
       +
       	// make sure the session is empty

     

       109
       109
       +
       	sess.Values = map[interface{}]interface{}{}

     

       110
       110
       +
       	sess.Values["oauth_state"] = parResp.State

     

       111
       111
       +
       	sess.Values["oauth_did"] = did

     

       112
       112
       +
       

     

       113
       113
       +
       	if err := sess.Save(e.Request(), e.Response()); err != nil {

     

       114
       114
       +
       		return err

     

       115
       115
       +
       	}

     

       116
       116
       +
       

     

       117
       117
       +
       	return e.Redirect(302, u.String())

     

       118
       118
       +
       }

     

       119
       119
       +
       

     

       120
       120
       +
       func (s *TestServer) handleCallback(e echo.Context) error {

     

       121
       121
       +
       	resState := e.QueryParam("state")

     

       122
       122
       +
       	resIss := e.QueryParam("iss")

     

       123
       123
       +
       	resCode := e.QueryParam("code")

     

       124
       124
       +
       

     

       125
       125
       +
       	sess, err := session.Get("session", e)

     

       126
       126
       +
       	if err != nil {

     

       127
       127
       +
       		return err

     

       128
       128
       +
       	}

     

       129
       129
       +
       

     

       130
       130
       +
       	sessState := sess.Values["oauth_state"]

     

       131
       131
       +
       	sessDid := sess.Values["oauth_did"]

     

       132
       132
       +
       

     

       133
       133
       +
       	if resState == "" || resIss == "" || resCode == "" || sessState == "" || sessDid == "" {

     

       134
       134
       +
       		return fmt.Errorf("request missing needed parameters")

     

       135
       135
       +
       	}

     

       136
       136
       +
       

     

       137
       137
       +
       	if resState != sessState {

     

       138
       138
       +
       		return fmt.Errorf("session state does not match response state")

     

       139
       139
       +
       	}

     

       140
       140
       +
       

     

       141
       141
       +
       	var oauthRequest OauthRequest

     

       142
       142
       +
       	if err := s.db.Raw("SELECT * FROM oauth_requests WHERE state = ? AND did = ?", sessState, sessDid).Scan(&oauthRequest).Error; err != nil {

     

       143
       143
       +
       		return err

     

       144
       144
       +
       	}

     

       145
       145
       +
       

     

       146
       146
       +
       	if err := s.db.Exec("DELETE FROM oauth_requests WHERE state = ? AND did = ?", sessState, sessDid).Error; err != nil {

     

       147
       147
       +
       		return err

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	if resIss != oauthRequest.AuthserverIss {

     

       151
       151
       +
       		return fmt.Errorf("incoming iss did not match authserver iss")

     

       152
       152
       +
       	}

     

       153
       153
       +
       

     

       154
       154
       +
       	jwk, err := oauth.ParseKeyFromBytes([]byte(oauthRequest.DpopPrivateJwk))

     

       155
       155
       +
       	if err != nil {

     

       156
       156
       +
       		return err

     

       157
       157
       +
       	}

     

       158
       158
       +
       

     

       159
       159
       +
       	initialTokenResp, err := s.oauthClient.InitialTokenRequest(

     

       160
       160
       +
       		e.Request().Context(),

     

       161
       161
       +
       		resCode,

     

       162
       162
       +
       		resIss,

     

       163
       163
       +
       		resIss,

     

       164
       164
       +
       		oauthRequest.PkceVerifier,

     

       165
       165
       +
       		oauthRequest.DpopAuthserverNonce,

     

       166
       166
       +
       		jwk,

     

       167
       167
       +
       	)

     

       168
       168
       +
       	if err != nil {

     

       169
       169
       +
       		return err

     

       170
       170
       +
       	}

     

       171
       171
       +
       

     

       172
       172
       +
       	// TODO: resolve if needed

     

       173
       173
       +
       

     

       174
       174
       +
       	if initialTokenResp.Resp["scope"] != scope {

     

       175
       175
       +
       		return fmt.Errorf("did not receive correct scopes from token request")

     

       176
       176
       +
       	}

     

       177
       177
       +
       

     

       178
       178
       +
       	oauthSession := &OauthSession{

     

       179
       179
       +
       		Did:                 oauthRequest.Did,

     

       180
       180
       +
       		PdsUrl:              oauthRequest.PdsUrl,

     

       181
       181
       +
       		AuthserverIss:       oauthRequest.AuthserverIss,

     

       182
       182
       +
       		AccessToken:         initialTokenResp.Resp["access_token"].(string),

     

       183
       183
       +
       		RefreshToken:        initialTokenResp.Resp["refresh_token"].(string),

     

       184
       184
       +
       		DpopAuthserverNonce: initialTokenResp.DpopAuthserverNonce,

     

       185
       185
       +
       		DpopPrivateJwk:      oauthRequest.DpopPrivateJwk,

     

       186
       186
       +
       	}

     

       187
       187
       +
       

     

       188
       188
       +
       	if err := s.db.Clauses(clause.OnConflict{

     

       189
       189
       +
       		Columns:   []clause.Column{{Name: "did"}},

     

       190
       190
       +
       		UpdateAll: true,

     

       191
       191
       +
       	}).Create(oauthSession).Error; err != nil {

     

       192
       192
       +
       		return err

     

       193
       193
       +
       	}

     

       194
       194
       +
       

     

       195
       195
       +
       	sess.Options = &sessions.Options{

     

       196
       196
       +
       		Path:     "/",

     

       197
       197
       +
       		MaxAge:   86400 * 7,

     

       198
       198
       +
       		HttpOnly: true,

     

       199
       199
       +
       	}

     

       200
       200
       +
       

     

       201
       201
       +
       	// make sure the session is empty

     

       202
       202
       +
       	sess.Values = map[interface{}]interface{}{}

     

       203
       203
       +
       	sess.Values["did"] = oauthRequest.Did

     

       204
       204
       +
       

     

       205
       205
       +
       	if err := sess.Save(e.Request(), e.Response()); err != nil {

     

       206
       206
       +
       		return err

     

       207
       207
       +
       	}

     

       208
       208
       +
       

     

       209
       209
       +
       	return e.Redirect(302, "/")

     

       210
       210
       +
       }

     

       211
       211
       +
       

     

       212
       212
       +
       func (s *TestServer) handleLogout(e echo.Context) error {

     

       213
       213
       +
       	sess, err := session.Get("session", e)

     

       214
       214
       +
       	if err != nil {

     

       215
       215
       +
       		return err

     

       216
       216
       +
       	}

     

       217
       217
       +
       

     

       218
       218
       +
       	sess.Options = &sessions.Options{

     

       219
       219
       +
       		Path:     "/",

     

       220
       220
       +
       		MaxAge:   -1,

     

       221
       221
       +
       		HttpOnly: true,

     

       222
       222
       +
       	}

     

       223
       223
       +
       

     

       224
       224
       +
       	if err := sess.Save(e.Request(), e.Response()); err != nil {

     

       225
       225
       +
       		return err

     

       226
       226
       +
       	}

     

       227
       227
       +
       

     

       228
       228
       +
       	return e.Redirect(302, "/")

     

       229
       229
       +
       }

+51

cmd/client_test/handle_post.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/api/atproto"

     

       5
       5
       +
       	"github.com/bluesky-social/indigo/api/bsky"

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/lex/util"

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/xrpc"

     

       9
       9
       +
       	"github.com/labstack/echo-contrib/session"

     

       10
       10
       +
       	"github.com/labstack/echo/v4"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       func (s *TestServer) handleMakePost(e echo.Context) error {

     

       14
       14
       +
       	sess, err := session.Get("session", e)

     

       15
       15
       +
       	if err != nil {

     

       16
       16
       +
       		return err

     

       17
       17
       +
       	}

     

       18
       18
       +
       

     

       19
       19
       +
       	did, ok := sess.Values["did"]

     

       20
       20
       +
       	if !ok {

     

       21
       21
       +
       		return e.Redirect(302, "/login")

     

       22
       22
       +
       	}

     

       23
       23
       +
       

     

       24
       24
       +
       	var oauthSession OauthSession

     

       25
       25
       +
       	if err := s.db.Raw("SELECT * FROM oauth_sessions WHERE did = ?", did).Scan(&oauthSession).Error; err != nil {

     

       26
       26
       +
       		return err

     

       27
       27
       +
       	}

     

       28
       28
       +
       

     

       29
       29
       +
       	args, err := authedReqArgsFromSession(&oauthSession)

     

       30
       30
       +
       	if err != nil {

     

       31
       31
       +
       		return err

     

       32
       32
       +
       	}

     

       33
       33
       +
       

     

       34
       34
       +
       	post := bsky.FeedPost{

     

       35
       35
       +
       		Text:      "hello from atproto golang oauth client",

     

       36
       36
       +
       		CreatedAt: syntax.DatetimeNow().String(),

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	input := atproto.RepoCreateRecord_Input{

     

       40
       40
       +
       		Collection: "app.bsky.feed.post",

     

       41
       41
       +
       		Repo:       oauthSession.Did,

     

       42
       42
       +
       		Record:     &util.LexiconTypeDecoder{Val: &post},

     

       43
       43
       +
       	}

     

       44
       44
       +
       

     

       45
       45
       +
       	var out atproto.RepoCreateRecord_Output

     

       46
       46
       +
       	if err := s.xrpcCli.Do(e.Request().Context(), args, xrpc.Procedure, "application/json", "com.atproto.repo.createRecord", nil, input, &out); err != nil {

     

       47
       47
       +
       		return err

     

       48
       48
       +
       	}

     

       49
       49
       +
       

     

       50
       50
       +
       	return e.File(getFilePath("make-post.html"))

     

       51
       51
       +
       }

-377

cmd/client_test/main.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       5
        
       	"fmt"

     

       7
       6
        
       	"html/template"

     

       8
       7
        
       	"io"

     

       9
       8
        
       	"log/slog"

     

       10
       10
       -
       	"net"

     

       11
       9
        
       	"net/http"

     

       12
       12
       -
       	"net/url"

     

       13
       10
        
       	"os"

     

       14
       14
       -
       	"strings"

     

       15
       11
        
       

     

       16
       16
       -
       	"github.com/bluesky-social/indigo/api/atproto"

     

       17
       17
       -
       	"github.com/bluesky-social/indigo/api/bsky"

     

       18
       18
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       19
       19
       -
       	"github.com/bluesky-social/indigo/lex/util"

     

       20
       20
       -
       	"github.com/bluesky-social/indigo/xrpc"

     

       21
       12
        
       	"github.com/gorilla/sessions"

     

       22
       13
        
       	oauth "github.com/haileyok/atproto-oauth-golang"

     

       23
       14
        
       	_ "github.com/joho/godotenv/autoload"

     
···

       28
       19
        
       	"github.com/urfave/cli/v2"

     

       29
       20
        
       	"gorm.io/driver/sqlite"

     

       30
       21
        
       	"gorm.io/gorm"

     

       31
       31
       -
       	"gorm.io/gorm/clause"

     

       32
       22
        
       )

     

       33
       23
        
       

     

       34
       24
        
       var (

     
···

       214
       204
        
       	return e.JSON(200, s.jwksResponse)

     

       215
       205
        
       }

     

       216
       206
        
       

     

       217
       217
       -
       func (s *TestServer) handleLoginSubmit(e echo.Context) error {

     

       218
       218
       -
       	handle := e.FormValue("handle")

     

       219
       219
       -
       	if handle == "" {

     

       220
       220
       -
       		return e.Redirect(302, "/login?e=handle-empty")

     

       221
       221
       -
       	}

     

       222
       222
       -
       

     

       223
       223
       -
       	_, herr := syntax.ParseHandle(handle)

     

       224
       224
       -
       	_, derr := syntax.ParseDID(handle)

     

       225
       225
       -
       

     

       226
       226
       -
       	if herr != nil && derr != nil {

     

       227
       227
       -
       		return e.Redirect(302, "/login?e=handle-invalid")

     

       228
       228
       -
       	}

     

       229
       229
       -
       

     

       230
       230
       -
       	var did string

     

       231
       231
       -
       

     

       232
       232
       -
       	if derr == nil {

     

       233
       233
       -
       		did = handle

     

       234
       234
       -
       	} else {

     

       235
       235
       -
       		maybeDid, err := resolveHandle(e.Request().Context(), handle)

     

       236
       236
       -
       		if err != nil {

     

       237
       237
       -
       			return err

     

       238
       238
       -
       		}

     

       239
       239
       -
       

     

       240
       240
       -
       		did = maybeDid

     

       241
       241
       -
       	}

     

       242
       242
       -
       

     

       243
       243
       -
       	service, err := resolveService(ctx, did)

     

       244
       244
       -
       	if err != nil {

     

       245
       245
       -
       		return err

     

       246
       246
       -
       	}

     

       247
       247
       -
       

     

       248
       248
       -
       	authserver, err := s.oauthClient.ResolvePDSAuthServer(ctx, service)

     

       249
       249
       -
       	if err != nil {

     

       250
       250
       -
       		return err

     

       251
       251
       -
       	}

     

       252
       252
       -
       

     

       253
       253
       -
       	meta, err := s.oauthClient.FetchAuthServerMetadata(ctx, authserver)

     

       254
       254
       -
       	if err != nil {

     

       255
       255
       -
       		return err

     

       256
       256
       -
       	}

     

       257
       257
       -
       

     

       258
       258
       -
       	dpopPrivateKey, err := oauth.GenerateKey(nil)

     

       259
       259
       -
       	if err != nil {

     

       260
       260
       -
       		return err

     

       261
       261
       -
       	}

     

       262
       262
       -
       

     

       263
       263
       -
       	dpopPrivateKeyJson, err := json.Marshal(dpopPrivateKey)

     

       264
       264
       -
       	if err != nil {

     

       265
       265
       -
       		return err

     

       266
       266
       -
       	}

     

       267
       267
       -
       

     

       268
       268
       -
       	parResp, err := s.oauthClient.SendParAuthRequest(

     

       269
       269
       -
       		ctx,

     

       270
       270
       -
       		authserver,

     

       271
       271
       -
       		meta,

     

       272
       272
       -
       		"",

     

       273
       273
       -
       		scope,

     

       274
       274
       -
       		dpopPrivateKey,

     

       275
       275
       -
       	)

     

       276
       276
       -
       

     

       277
       277
       -
       	oauthRequest := &OauthRequest{

     

       278
       278
       -
       		State:               parResp.State,

     

       279
       279
       -
       		AuthserverIss:       meta.Issuer,

     

       280
       280
       -
       		Did:                 did,

     

       281
       281
       -
       		PdsUrl:              service,

     

       282
       282
       -
       		PkceVerifier:        parResp.PkceVerifier,

     

       283
       283
       -
       		DpopAuthserverNonce: parResp.DpopAuthserverNonce,

     

       284
       284
       -
       		DpopPrivateJwk:      string(dpopPrivateKeyJson),

     

       285
       285
       -
       	}

     

       286
       286
       -
       

     

       287
       287
       -
       	if err := s.db.Create(oauthRequest).Error; err != nil {

     

       288
       288
       -
       		return err

     

       289
       289
       -
       	}

     

       290
       290
       -
       

     

       291
       291
       -
       	u, _ := url.Parse(meta.AuthorizationEndpoint)

     

       292
       292
       -
       	u.RawQuery = fmt.Sprintf(

     

       293
       293
       -
       		"client_id=%s&request_uri=%s",

     

       294
       294
       -
       		url.QueryEscape(serverMetadataUrl),

     

       295
       295
       -
       		parResp.Resp["request_uri"].(string),

     

       296
       296
       -
       	)

     

       297
       297
       -
       

     

       298
       298
       -
       	sess, err := session.Get("session", e)

     

       299
       299
       -
       	if err != nil {

     

       300
       300
       -
       		return err

     

       301
       301
       -
       	}

     

       302
       302
       -
       

     

       303
       303
       -
       	sess.Options = &sessions.Options{

     

       304
       304
       -
       		Path:     "/",

     

       305
       305
       -
       		MaxAge:   300, // save for five minutes

     

       306
       306
       -
       		HttpOnly: true,

     

       307
       307
       -
       	}

     

       308
       308
       -
       

     

       309
       309
       -
       	// make sure the session is empty

     

       310
       310
       -
       	sess.Values = map[interface{}]interface{}{}

     

       311
       311
       -
       	sess.Values["oauth_state"] = parResp.State

     

       312
       312
       -
       	sess.Values["oauth_did"] = did

     

       313
       313
       -
       

     

       314
       314
       -
       	if err := sess.Save(e.Request(), e.Response()); err != nil {

     

       315
       315
       -
       		return err

     

       316
       316
       -
       	}

     

       317
       317
       -
       

     

       318
       318
       -
       	return e.Redirect(302, u.String())

     

       319
       319
       -
       }

     

       320
       320
       -
       

     

       321
       321
       -
       func (s *TestServer) handleCallback(e echo.Context) error {

     

       322
       322
       -
       	resState := e.QueryParam("state")

     

       323
       323
       -
       	resIss := e.QueryParam("iss")

     

       324
       324
       -
       	resCode := e.QueryParam("code")

     

       325
       325
       -
       

     

       326
       326
       -
       	sess, err := session.Get("session", e)

     

       327
       327
       -
       	if err != nil {

     

       328
       328
       -
       		return err

     

       329
       329
       -
       	}

     

       330
       330
       -
       

     

       331
       331
       -
       	sessState := sess.Values["oauth_state"]

     

       332
       332
       -
       	sessDid := sess.Values["oauth_did"]

     

       333
       333
       -
       

     

       334
       334
       -
       	if resState == "" || resIss == "" || resCode == "" || sessState == "" || sessDid == "" {

     

       335
       335
       -
       		return fmt.Errorf("request missing needed parameters")

     

       336
       336
       -
       	}

     

       337
       337
       -
       

     

       338
       338
       -
       	if resState != sessState {

     

       339
       339
       -
       		return fmt.Errorf("session state does not match response state")

     

       340
       340
       -
       	}

     

       341
       341
       -
       

     

       342
       342
       -
       	var oauthRequest OauthRequest

     

       343
       343
       -
       	if err := s.db.Raw("SELECT * FROM oauth_requests WHERE state = ? AND did = ?", sessState, sessDid).Scan(&oauthRequest).Error; err != nil {

     

       344
       344
       -
       		return err

     

       345
       345
       -
       	}

     

       346
       346
       -
       

     

       347
       347
       -
       	if err := s.db.Exec("DELETE FROM oauth_requests WHERE state = ? AND did = ?", sessState, sessDid).Error; err != nil {

     

       348
       348
       -
       		return err

     

       349
       349
       -
       	}

     

       350
       350
       -
       

     

       351
       351
       -
       	if resIss != oauthRequest.AuthserverIss {

     

       352
       352
       -
       		return fmt.Errorf("incoming iss did not match authserver iss")

     

       353
       353
       -
       	}

     

       354
       354
       -
       

     

       355
       355
       -
       	jwk, err := oauth.ParseKeyFromBytes([]byte(oauthRequest.DpopPrivateJwk))

     

       356
       356
       -
       	if err != nil {

     

       357
       357
       -
       		return err

     

       358
       358
       -
       	}

     

       359
       359
       -
       

     

       360
       360
       -
       	initialTokenResp, err := s.oauthClient.InitialTokenRequest(

     

       361
       361
       -
       		e.Request().Context(),

     

       362
       362
       -
       		resCode,

     

       363
       363
       -
       		resIss,

     

       364
       364
       -
       		resIss,

     

       365
       365
       -
       		oauthRequest.PkceVerifier,

     

       366
       366
       -
       		oauthRequest.DpopAuthserverNonce,

     

       367
       367
       -
       		jwk,

     

       368
       368
       -
       	)

     

       369
       369
       -
       	if err != nil {

     

       370
       370
       -
       		return err

     

       371
       371
       -
       	}

     

       372
       372
       -
       

     

       373
       373
       -
       	// TODO: resolve if needed

     

       374
       374
       -
       

     

       375
       375
       -
       	if initialTokenResp.Resp["scope"] != scope {

     

       376
       376
       -
       		return fmt.Errorf("did not receive correct scopes from token request")

     

       377
       377
       -
       	}

     

       378
       378
       -
       

     

       379
       379
       -
       	oauthSession := &OauthSession{

     

       380
       380
       -
       		Did:                 oauthRequest.Did,

     

       381
       381
       -
       		PdsUrl:              oauthRequest.PdsUrl,

     

       382
       382
       -
       		AuthserverIss:       oauthRequest.AuthserverIss,

     

       383
       383
       -
       		AccessToken:         initialTokenResp.Resp["access_token"].(string),

     

       384
       384
       -
       		RefreshToken:        initialTokenResp.Resp["refresh_token"].(string),

     

       385
       385
       -
       		DpopAuthserverNonce: initialTokenResp.DpopAuthserverNonce,

     

       386
       386
       -
       		DpopPrivateJwk:      oauthRequest.DpopPrivateJwk,

     

       387
       387
       -
       	}

     

       388
       388
       -
       

     

       389
       389
       -
       	if err := s.db.Clauses(clause.OnConflict{

     

       390
       390
       -
       		Columns:   []clause.Column{{Name: "did"}},

     

       391
       391
       -
       		UpdateAll: true,

     

       392
       392
       -
       	}).Create(oauthSession).Error; err != nil {

     

       393
       393
       -
       		return err

     

       394
       394
       -
       	}

     

       395
       395
       -
       

     

       396
       396
       -
       	sess.Options = &sessions.Options{

     

       397
       397
       -
       		Path:     "/",

     

       398
       398
       -
       		MaxAge:   86400 * 7,

     

       399
       399
       -
       		HttpOnly: true,

     

       400
       400
       -
       	}

     

       401
       401
       -
       

     

       402
       402
       -
       	// make sure the session is empty

     

       403
       403
       -
       	sess.Values = map[interface{}]interface{}{}

     

       404
       404
       -
       	sess.Values["did"] = oauthRequest.Did

     

       405
       405
       -
       

     

       406
       406
       -
       	if err := sess.Save(e.Request(), e.Response()); err != nil {

     

       407
       407
       -
       		return err

     

       408
       408
       -
       	}

     

       409
       409
       -
       

     

       410
       410
       -
       	return e.Redirect(302, "/")

     

       411
       411
       -
       }

     

       412
       412
       -
       

     

       413
       413
       -
       func (s *TestServer) handleLogout(e echo.Context) error {

     

       414
       414
       -
       	sess, err := session.Get("session", e)

     

       415
       415
       -
       	if err != nil {

     

       416
       416
       -
       		return err

     

       417
       417
       -
       	}

     

       418
       418
       -
       

     

       419
       419
       -
       	sess.Options = &sessions.Options{

     

       420
       420
       -
       		Path:     "/",

     

       421
       421
       -
       		MaxAge:   -1,

     

       422
       422
       -
       		HttpOnly: true,

     

       423
       423
       -
       	}

     

       424
       424
       -
       

     

       425
       425
       -
       	if err := sess.Save(e.Request(), e.Response()); err != nil {

     

       426
       426
       -
       		return err

     

       427
       427
       -
       	}

     

       428
       428
       -
       

     

       429
       429
       -
       	return e.Redirect(302, "/")

     

       430
       430
       -
       }

     

       431
       431
       -
       

     

       432
       432
       -
       func (s *TestServer) handleMakePost(e echo.Context) error {

     

       433
       433
       -
       	sess, err := session.Get("session", e)

     

       434
       434
       -
       	if err != nil {

     

       435
       435
       -
       		return err

     

       436
       436
       -
       	}

     

       437
       437
       -
       

     

       438
       438
       -
       	did, ok := sess.Values["did"]

     

       439
       439
       -
       	if !ok {

     

       440
       440
       -
       		return e.Redirect(302, "/login")

     

       441
       441
       -
       	}

     

       442
       442
       -
       

     

       443
       443
       -
       	var oauthSession OauthSession

     

       444
       444
       -
       	if err := s.db.Raw("SELECT * FROM oauth_sessions WHERE did = ?", did).Scan(&oauthSession).Error; err != nil {

     

       445
       445
       -
       		return err

     

       446
       446
       -
       	}

     

       447
       447
       -
       

     

       448
       448
       -
       	args, err := authedReqArgsFromSession(&oauthSession)

     

       449
       449
       -
       	if err != nil {

     

       450
       450
       -
       		return err

     

       451
       451
       -
       	}

     

       452
       452
       -
       

     

       453
       453
       -
       	post := bsky.FeedPost{

     

       454
       454
       -
       		Text:      "hello from atproto golang oauth client",

     

       455
       455
       -
       		CreatedAt: syntax.DatetimeNow().String(),

     

       456
       456
       -
       	}

     

       457
       457
       -
       

     

       458
       458
       -
       	input := atproto.RepoCreateRecord_Input{

     

       459
       459
       -
       		Collection: "app.bsky.feed.post",

     

       460
       460
       -
       		Repo:       oauthSession.Did,

     

       461
       461
       -
       		Record:     &util.LexiconTypeDecoder{Val: &post},

     

       462
       462
       -
       	}

     

       463
       463
       -
       

     

       464
       464
       -
       	var out atproto.RepoCreateRecord_Output

     

       465
       465
       -
       	if err := s.xrpcCli.Do(e.Request().Context(), args, xrpc.Procedure, "application/json", "com.atproto.repo.createRecord", nil, input, &out); err != nil {

     

       466
       466
       -
       		return err

     

       467
       467
       -
       	}

     

       468
       468
       -
       

     

       469
       469
       -
       	return e.File(getFilePath("make-post.html"))

     

       470
       470
       -
       }

     

       471
       471
       -
       

     

       472
       207
        
       func authedReqArgsFromSession(session *OauthSession) (*oauth.XrpcAuthedRequestArgs, error) {

     

       473
       208
        
       	privateJwk, err := oauth.ParseKeyFromBytes([]byte(session.DpopPrivateJwk))

     

       474
       209
        
       	if err != nil {

     
···

       483
       218
        
       		DpopPdsNonce:   session.DpopPdsNonce,

     

       484
       219
        
       		DpopPrivateJwk: privateJwk,

     

       485
       220
        
       	}, nil

     

       486
       486
       -
       }

     

       487
       487
       -
       

     

       488
       488
       -
       func resolveHandle(ctx context.Context, handle string) (string, error) {

     

       489
       489
       -
       	var did string

     

       490
       490
       -
       

     

       491
       491
       -
       	_, err := syntax.ParseHandle(handle)

     

       492
       492
       -
       	if err != nil {

     

       493
       493
       -
       		return "", err

     

       494
       494
       -
       	}

     

       495
       495
       -
       

     

       496
       496
       -
       	recs, err := net.LookupTXT(fmt.Sprintf("_atproto.%s", handle))

     

       497
       497
       -
       	if err != nil {

     

       498
       498
       -
       		return "", err

     

       499
       499
       -
       	}

     

       500
       500
       -
       

     

       501
       501
       -
       	for _, rec := range recs {

     

       502
       502
       -
       		if strings.HasPrefix(rec, "did=") {

     

       503
       503
       -
       			did = strings.Split(rec, "did=")[1]

     

       504
       504
       -
       			break

     

       505
       505
       -
       		}

     

       506
       506
       -
       	}

     

       507
       507
       -
       

     

       508
       508
       -
       	if did == "" {

     

       509
       509
       -
       		req, err := http.NewRequestWithContext(

     

       510
       510
       -
       			ctx,

     

       511
       511
       -
       			"GET",

     

       512
       512
       -
       			fmt.Sprintf("https://%s/.well-known/atproto-did", handle),

     

       513
       513
       -
       			nil,

     

       514
       514
       -
       		)

     

       515
       515
       -
       		if err != nil {

     

       516
       516
       -
       			return "", err

     

       517
       517
       -
       		}

     

       518
       518
       -
       

     

       519
       519
       -
       		resp, err := http.DefaultClient.Do(req)

     

       520
       520
       -
       		if err != nil {

     

       521
       521
       -
       			return "", err

     

       522
       522
       -
       		}

     

       523
       523
       -
       		defer resp.Body.Close()

     

       524
       524
       -
       

     

       525
       525
       -
       		if resp.StatusCode != http.StatusOK {

     

       526
       526
       -
       			io.Copy(io.Discard, resp.Body)

     

       527
       527
       -
       			return "", fmt.Errorf("unable to resolve handle")

     

       528
       528
       -
       		}

     

       529
       529
       -
       

     

       530
       530
       -
       		b, err := io.ReadAll(resp.Body)

     

       531
       531
       -
       		if err != nil {

     

       532
       532
       -
       			return "", err

     

       533
       533
       -
       		}

     

       534
       534
       -
       

     

       535
       535
       -
       		maybeDid := string(b)

     

       536
       536
       -
       

     

       537
       537
       -
       		if _, err := syntax.ParseDID(maybeDid); err != nil {

     

       538
       538
       -
       			return "", fmt.Errorf("unable to resolve handle")

     

       539
       539
       -
       		}

     

       540
       540
       -
       

     

       541
       541
       -
       		did = maybeDid

     

       542
       542
       -
       	}

     

       543
       543
       -
       

     

       544
       544
       -
       	return did, nil

     

       545
       545
       -
       }

     

       546
       546
       -
       

     

       547
       547
       -
       func resolveService(ctx context.Context, did string) (string, error) {

     

       548
       548
       -
       	type Identity struct {

     

       549
       549
       -
       		Service []struct {

     

       550
       550
       -
       			ID              string `json:"id"`

     

       551
       551
       -
       			Type            string `json:"type"`

     

       552
       552
       -
       			ServiceEndpoint string `json:"serviceEndpoint"`

     

       553
       553
       -
       		} `json:"service"`

     

       554
       554
       -
       	}

     

       555
       555
       -
       

     

       556
       556
       -
       	var ustr string

     

       557
       557
       -
       	if strings.HasPrefix(did, "did:plc:") {

     

       558
       558
       -
       		ustr = fmt.Sprintf("https://plc.directory/%s", did)

     

       559
       559
       -
       	} else if strings.HasPrefix(did, "did:web:") {

     

       560
       560
       -
       		ustr = fmt.Sprintf("https://%s/.well-known/did.json", did)

     

       561
       561
       -
       	} else {

     

       562
       562
       -
       		return "", fmt.Errorf("did was not a supported did type")

     

       563
       563
       -
       	}

     

       564
       564
       -
       

     

       565
       565
       -
       	req, err := http.NewRequestWithContext(ctx, "GET", ustr, nil)

     

       566
       566
       -
       	if err != nil {

     

       567
       567
       -
       		return "", err

     

       568
       568
       -
       	}

     

       569
       569
       -
       

     

       570
       570
       -
       	resp, err := http.DefaultClient.Do(req)

     

       571
       571
       -
       	if err != nil {

     

       572
       572
       -
       		return "", err

     

       573
       573
       -
       	}

     

       574
       574
       -
       	defer resp.Body.Close()

     

       575
       575
       -
       

     

       576
       576
       -
       	if resp.StatusCode != 200 {

     

       577
       577
       -
       		io.Copy(io.Discard, resp.Body)

     

       578
       578
       -
       		return "", fmt.Errorf("could not find identity in plc registry")

     

       579
       579
       -
       	}

     

       580
       580
       -
       

     

       581
       581
       -
       	var identity Identity

     

       582
       582
       -
       	if err := json.NewDecoder(resp.Body).Decode(&identity); err != nil {

     

       583
       583
       -
       		return "", err

     

       584
       584
       -
       	}

     

       585
       585
       -
       

     

       586
       586
       -
       	var service string

     

       587
       587
       -
       	for _, svc := range identity.Service {

     

       588
       588
       -
       		if svc.ID == "#atproto_pds" {

     

       589
       589
       -
       			service = svc.ServiceEndpoint

     

       590
       590
       -
       		}

     

       591
       591
       -
       	}

     

       592
       592
       -
       

     

       593
       593
       -
       	if service == "" {

     

       594
       594
       -
       		return "", fmt.Errorf("could not find atproto_pds service in identity services")

     

       595
       595
       -
       	}

     

       596
       596
       -
       

     

       597
       597
       -
       	return service, nil

     

       598
       221
        
       }

     

       599
       222
        
       

     

       600
       223
        
       func getFilePath(file string) string {

+125

cmd/client_test/resolution.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"encoding/json"

     

       6
       6
       +
       	"fmt"

     

       7
       7
       +
       	"io"

     

       8
       8
       +
       	"net"

     

       9
       9
       +
       	"net/http"

     

       10
       10
       +
       	"strings"

     

       11
       11
       +
       

     

       12
       12
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       func resolveHandle(ctx context.Context, handle string) (string, error) {

     

       16
       16
       +
       	var did string

     

       17
       17
       +
       

     

       18
       18
       +
       	_, err := syntax.ParseHandle(handle)

     

       19
       19
       +
       	if err != nil {

     

       20
       20
       +
       		return "", err

     

       21
       21
       +
       	}

     

       22
       22
       +
       

     

       23
       23
       +
       	recs, err := net.LookupTXT(fmt.Sprintf("_atproto.%s", handle))

     

       24
       24
       +
       	if err != nil {

     

       25
       25
       +
       		return "", err

     

       26
       26
       +
       	}

     

       27
       27
       +
       

     

       28
       28
       +
       	for _, rec := range recs {

     

       29
       29
       +
       		if strings.HasPrefix(rec, "did=") {

     

       30
       30
       +
       			did = strings.Split(rec, "did=")[1]

     

       31
       31
       +
       			break

     

       32
       32
       +
       		}

     

       33
       33
       +
       	}

     

       34
       34
       +
       

     

       35
       35
       +
       	if did == "" {

     

       36
       36
       +
       		req, err := http.NewRequestWithContext(

     

       37
       37
       +
       			ctx,

     

       38
       38
       +
       			"GET",

     

       39
       39
       +
       			fmt.Sprintf("https://%s/.well-known/atproto-did", handle),

     

       40
       40
       +
       			nil,

     

       41
       41
       +
       		)

     

       42
       42
       +
       		if err != nil {

     

       43
       43
       +
       			return "", err

     

       44
       44
       +
       		}

     

       45
       45
       +
       

     

       46
       46
       +
       		resp, err := http.DefaultClient.Do(req)

     

       47
       47
       +
       		if err != nil {

     

       48
       48
       +
       			return "", err

     

       49
       49
       +
       		}

     

       50
       50
       +
       		defer resp.Body.Close()

     

       51
       51
       +
       

     

       52
       52
       +
       		if resp.StatusCode != http.StatusOK {

     

       53
       53
       +
       			io.Copy(io.Discard, resp.Body)

     

       54
       54
       +
       			return "", fmt.Errorf("unable to resolve handle")

     

       55
       55
       +
       		}

     

       56
       56
       +
       

     

       57
       57
       +
       		b, err := io.ReadAll(resp.Body)

     

       58
       58
       +
       		if err != nil {

     

       59
       59
       +
       			return "", err

     

       60
       60
       +
       		}

     

       61
       61
       +
       

     

       62
       62
       +
       		maybeDid := string(b)

     

       63
       63
       +
       

     

       64
       64
       +
       		if _, err := syntax.ParseDID(maybeDid); err != nil {

     

       65
       65
       +
       			return "", fmt.Errorf("unable to resolve handle")

     

       66
       66
       +
       		}

     

       67
       67
       +
       

     

       68
       68
       +
       		did = maybeDid

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	return did, nil

     

       72
       72
       +
       }

     

       73
       73
       +
       

     

       74
       74
       +
       func resolveService(ctx context.Context, did string) (string, error) {

     

       75
       75
       +
       	type Identity struct {

     

       76
       76
       +
       		Service []struct {

     

       77
       77
       +
       			ID              string `json:"id"`

     

       78
       78
       +
       			Type            string `json:"type"`

     

       79
       79
       +
       			ServiceEndpoint string `json:"serviceEndpoint"`

     

       80
       80
       +
       		} `json:"service"`

     

       81
       81
       +
       	}

     

       82
       82
       +
       

     

       83
       83
       +
       	var ustr string

     

       84
       84
       +
       	if strings.HasPrefix(did, "did:plc:") {

     

       85
       85
       +
       		ustr = fmt.Sprintf("https://plc.directory/%s", did)

     

       86
       86
       +
       	} else if strings.HasPrefix(did, "did:web:") {

     

       87
       87
       +
       		ustr = fmt.Sprintf("https://%s/.well-known/did.json", did)

     

       88
       88
       +
       	} else {

     

       89
       89
       +
       		return "", fmt.Errorf("did was not a supported did type")

     

       90
       90
       +
       	}

     

       91
       91
       +
       

     

       92
       92
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", ustr, nil)

     

       93
       93
       +
       	if err != nil {

     

       94
       94
       +
       		return "", err

     

       95
       95
       +
       	}

     

       96
       96
       +
       

     

       97
       97
       +
       	resp, err := http.DefaultClient.Do(req)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return "", err

     

       100
       100
       +
       	}

     

       101
       101
       +
       	defer resp.Body.Close()

     

       102
       102
       +
       

     

       103
       103
       +
       	if resp.StatusCode != 200 {

     

       104
       104
       +
       		io.Copy(io.Discard, resp.Body)

     

       105
       105
       +
       		return "", fmt.Errorf("could not find identity in plc registry")

     

       106
       106
       +
       	}

     

       107
       107
       +
       

     

       108
       108
       +
       	var identity Identity

     

       109
       109
       +
       	if err := json.NewDecoder(resp.Body).Decode(&identity); err != nil {

     

       110
       110
       +
       		return "", err

     

       111
       111
       +
       	}

     

       112
       112
       +
       

     

       113
       113
       +
       	var service string

     

       114
       114
       +
       	for _, svc := range identity.Service {

     

       115
       115
       +
       		if svc.ID == "#atproto_pds" {

     

       116
       116
       +
       			service = svc.ServiceEndpoint

     

       117
       117
       +
       		}

     

       118
       118
       +
       	}

     

       119
       119
       +
       

     

       120
       120
       +
       	if service == "" {

     

       121
       121
       +
       		return "", fmt.Errorf("could not find atproto_pds service in identity services")

     

       122
       122
       +
       	}

     

       123
       123
       +
       

     

       124
       124
       +
       	return service, nil

     

       125
       125
       +
       }

-1

oauth.go

···

       254
       254
        
       		return nil, err

     

       255
       255
        
       	}

     

       256
       256
        
       

     

       257
       257
       -
       	// TODO: ??

     

       258
       257
        
       	dpopAuthserverNonce := ""

     

       259
       258
        
       	dpopProof, err := c.AuthServerDpopJwt("POST", parUrl, dpopAuthserverNonce, dpopPrivateKey)

     

       260
       259
        
       	if err != nil {

+9 -9

xrpc.go

···

       27
       27
        
       	OnDPoPNonceChanged func(did, newNonce string)

     

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
       +
       type XrpcAuthedRequestArgs struct {

     

       31
       31
       +
       	Did            string

     

       32
       32
       +
       	PdsUrl         string

     

       33
       33
       +
       	Issuer         string

     

       34
       34
       +
       	AccessToken    string

     

       35
       35
       +
       	DpopPdsNonce   string

     

       36
       36
       +
       	DpopPrivateJwk jwk.Key

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       30
       39
        
       func (c *XrpcClient) getClient() *http.Client {

     

       31
       40
        
       	if c.Client == nil {

     

       32
       41
        
       		return util.RobustHTTPClient()

     
···

       122
       131
        
       	}

     

       123
       132
        
       

     

       124
       133
        
       	return tokenString, nil

     

       125
       125
       -
       }

     

       126
       126
       -
       

     

       127
       127
       -
       type XrpcAuthedRequestArgs struct {

     

       128
       128
       -
       	Did            string

     

       129
       129
       -
       	PdsUrl         string

     

       130
       130
       -
       	Issuer         string

     

       131
       131
       -
       	AccessToken    string

     

       132
       132
       -
       	DpopPdsNonce   string

     

       133
       133
       -
       	DpopPrivateJwk jwk.Key

     

       134
       134
        
       }

     

       135
       135
        
       

     

       136
       136
        
       func (c *XrpcClient) Do(ctx context.Context, authedArgs *XrpcAuthedRequestArgs, kind xrpc.XRPCRequestType, inpenc, method string, params map[string]any, bodyobj any, out any) error {