willdot.net
forked from
hailey.at/cocoon
An atproto PDS written in Go
implement queryLabels and add new COCOON_REQUIRE_INVITE env (#47)
* implement queryLabels
* add a COCOON_REQUIRE_INVITE env to make invite codes be able to not be required (still required by default)
* handle handles for http requests and stuff
+1
-1
README.md
+1
-1
README.md
+6
cmd/cocoon/main.go
+6
cmd/cocoon/main.go
···
79
Name: "admin-password",
80
EnvVars: []string{"COCOON_ADMIN_PASSWORD"},
81
},
82
&cli.StringFlag{
83
Name: "smtp-user",
84
EnvVars: []string{"COCOON_SMTP_USER"},
···
185
Version: Version,
186
Relays: cmd.StringSlice("relays"),
187
AdminPassword: cmd.String("admin-password"),
188
SmtpUser: cmd.String("smtp-user"),
189
SmtpPass: cmd.String("smtp-pass"),
190
SmtpHost: cmd.String("smtp-host"),
···
79
Name: "admin-password",
80
EnvVars: []string{"COCOON_ADMIN_PASSWORD"},
81
},
82
+
&cli.BoolFlag{
83
+
Name: "require-invite",
84
+
EnvVars: []string{"COCOON_REQUIRE_INVITE"},
85
+
Value: true,
86
+
},
87
&cli.StringFlag{
88
Name: "smtp-user",
89
EnvVars: []string{"COCOON_SMTP_USER"},
···
190
Version: Version,
191
Relays: cmd.StringSlice("relays"),
192
AdminPassword: cmd.String("admin-password"),
193
+
RequireInvite: cmd.Bool("require-invite"),
194
SmtpUser: cmd.String("smtp-user"),
195
SmtpPass: cmd.String("smtp-pass"),
196
SmtpHost: cmd.String("smtp-host"),
+34
server/handle_label_query_labels.go
+34
server/handle_label_query_labels.go
···
···
1
+
package server
2
+
3
+
import (
4
+
"github.com/labstack/echo/v4"
5
+
)
6
+
7
+
type Label struct {
8
+
Ver *int `json:"ver,omitempty"`
9
+
Src string `json:"src"`
10
+
Uri string `json:"uri"`
11
+
Cid *string `json:"cid,omitempty"`
12
+
Val string `json:"val"`
13
+
Neg *bool `json:"neg,omitempty"`
14
+
Cts string `json:"cts"`
15
+
Exp *string `json:"exp,omitempty"`
16
+
Sig []byte `json:"sig,omitempty"`
17
+
}
18
+
19
+
type ComAtprotoLabelQueryLabelsResponse struct {
20
+
Cursor *string `json:"cursor,omitempty"`
21
+
Labels []Label `json:"labels"`
22
+
}
23
+
24
+
func (s *Server) handleLabelQueryLabels(e echo.Context) error {
25
+
svc := e.Request().Header.Get("atproto-proxy")
26
+
if svc != "" || s.config.FallbackProxy != "" {
27
+
return s.handleProxy(e)
28
+
}
29
+
30
+
return e.JSON(200, ComAtprotoLabelQueryLabelsResponse{
31
+
Cursor: nil,
32
+
Labels: []Label{},
33
+
})
34
+
}
+19
-11
server/handle_server_create_account.go
+19
-11
server/handle_server_create_account.go
···
25
Handle string `json:"handle" validate:"required,atproto-handle"`
26
Did *string `json:"did" validate:"atproto-did"`
27
Password string `json:"password" validate:"required"`
28
-
InviteCode string `json:"inviteCode" validate:"required"`
29
}
30
31
type ComAtprotoServerCreateAccountResponse struct {
···
104
}
105
106
var ic models.InviteCode
107
-
if err := s.db.Raw("SELECT * FROM invite_codes WHERE code = ?", nil, request.InviteCode).Scan(&ic).Error; err != nil {
108
-
if err == gorm.ErrRecordNotFound {
109
return helpers.InputError(e, to.StringPtr("InvalidInviteCode"))
110
}
111
-
s.logger.Error("error getting invite code from db", "error", err)
112
-
return helpers.ServerError(e, nil)
113
-
}
114
115
-
if ic.RemainingUseCount < 1 {
116
-
return helpers.InputError(e, to.StringPtr("InvalidInviteCode"))
117
}
118
119
// see if the email is already taken
···
234
})
235
}
236
237
-
if err := s.db.Raw("UPDATE invite_codes SET remaining_use_count = remaining_use_count - 1 WHERE code = ?", nil, request.InviteCode).Scan(&ic).Error; err != nil {
238
-
s.logger.Error("error decrementing use count", "error", err)
239
-
return helpers.ServerError(e, nil)
240
}
241
242
sess, err := s.createSession(&urepo)
···
25
Handle string `json:"handle" validate:"required,atproto-handle"`
26
Did *string `json:"did" validate:"atproto-did"`
27
Password string `json:"password" validate:"required"`
28
+
InviteCode string `json:"inviteCode" validate:"omitempty"`
29
}
30
31
type ComAtprotoServerCreateAccountResponse struct {
···
104
}
105
106
var ic models.InviteCode
107
+
if s.config.RequireInvite {
108
+
if strings.TrimSpace(request.InviteCode) == "" {
109
return helpers.InputError(e, to.StringPtr("InvalidInviteCode"))
110
}
111
112
+
if err := s.db.Raw("SELECT * FROM invite_codes WHERE code = ?", nil, request.InviteCode).Scan(&ic).Error; err != nil {
113
+
if err == gorm.ErrRecordNotFound {
114
+
return helpers.InputError(e, to.StringPtr("InvalidInviteCode"))
115
+
}
116
+
s.logger.Error("error getting invite code from db", "error", err)
117
+
return helpers.ServerError(e, nil)
118
+
}
119
+
120
+
if ic.RemainingUseCount < 1 {
121
+
return helpers.InputError(e, to.StringPtr("InvalidInviteCode"))
122
+
}
123
}
124
125
// see if the email is already taken
···
240
})
241
}
242
243
+
if s.config.RequireInvite {
244
+
if err := s.db.Raw("UPDATE invite_codes SET remaining_use_count = remaining_use_count - 1 WHERE code = ?", nil, request.InviteCode).Scan(&ic).Error; err != nil {
245
+
s.logger.Error("error decrementing use count", "error", err)
246
+
return helpers.ServerError(e, nil)
247
+
}
248
}
249
250
sess, err := s.createSession(&urepo)
+1
-1
server/handle_server_describe_server.go
+1
-1
server/handle_server_describe_server.go
···
22
23
func (s *Server) handleDescribeServer(e echo.Context) error {
24
return e.JSON(200, ComAtprotoServerDescribeServerResponse{
25
-
InviteCodeRequired: true,
26
PhoneVerificationRequired: false,
27
AvailableUserDomains: []string{"." + s.config.Hostname}, // TODO: more
28
Links: ComAtprotoServerDescribeServerResponseLinks{
···
22
23
func (s *Server) handleDescribeServer(e echo.Context) error {
24
return e.JSON(200, ComAtprotoServerDescribeServerResponse{
25
+
InviteCodeRequired: s.config.RequireInvite,
26
PhoneVerificationRequired: false,
27
AvailableUserDomains: []string{"." + s.config.Hostname}, // TODO: more
28
Links: ComAtprotoServerDescribeServerResponseLinks{
+33
server/handle_well_known.go
+33
server/handle_well_known.go
···
2
3
import (
4
"fmt"
5
+
"strings"
6
7
"github.com/Azure/go-autorest/autorest/to"
8
+
"github.com/haileyok/cocoon/internal/helpers"
9
"github.com/labstack/echo/v4"
10
+
"gorm.io/gorm"
11
)
12
13
var (
···
64
},
65
},
66
})
67
+
}
68
+
69
+
func (s *Server) handleAtprotoDid(e echo.Context) error {
70
+
host := e.Request().Host
71
+
if host == "" {
72
+
return helpers.InputError(e, to.StringPtr("Invalid handle."))
73
+
}
74
+
75
+
host = strings.Split(host, ":")[0]
76
+
host = strings.ToLower(strings.TrimSpace(host))
77
+
78
+
if host == s.config.Hostname {
79
+
return e.String(200, s.config.Did)
80
+
}
81
+
82
+
suffix := "." + s.config.Hostname
83
+
if !strings.HasSuffix(host, suffix) {
84
+
return e.NoContent(404)
85
+
}
86
+
87
+
actor, err := s.getActorByHandle(host)
88
+
if err != nil {
89
+
if err == gorm.ErrRecordNotFound {
90
+
return e.NoContent(404)
91
+
}
92
+
s.logger.Error("error looking up actor by handle", "error", err)
93
+
return helpers.ServerError(e, nil)
94
+
}
95
+
96
+
return e.String(200, actor.Did)
97
}
98
99
func (s *Server) handleOauthProtectedResource(e echo.Context) error {
+7
server/server.go
+7
server/server.go
···
102
ContactEmail string
103
Relays []string
104
AdminPassword string
105
106
SmtpUser string
107
SmtpPass string
···
126
EnforcePeering bool
127
Relays []string
128
AdminPassword string
129
SmtpEmail string
130
SmtpName string
131
BlockstoreVariant BlockstoreVariant
···
379
EnforcePeering: false,
380
Relays: args.Relays,
381
AdminPassword: args.AdminPassword,
382
SmtpName: args.SmtpName,
383
SmtpEmail: args.SmtpEmail,
384
BlockstoreVariant: args.BlockstoreVariant,
···
442
s.echo.GET("/", s.handleRoot)
443
s.echo.GET("/xrpc/_health", s.handleHealth)
444
s.echo.GET("/.well-known/did.json", s.handleWellKnown)
445
s.echo.GET("/.well-known/oauth-protected-resource", s.handleOauthProtectedResource)
446
s.echo.GET("/.well-known/oauth-authorization-server", s.handleOauthAuthorizationServer)
447
s.echo.GET("/robots.txt", s.handleRobots)
···
465
s.echo.GET("/xrpc/com.atproto.sync.subscribeRepos", s.handleSyncSubscribeRepos)
466
s.echo.GET("/xrpc/com.atproto.sync.listBlobs", s.handleSyncListBlobs)
467
s.echo.GET("/xrpc/com.atproto.sync.getBlob", s.handleSyncGetBlob)
468
469
// account
470
s.echo.GET("/account", s.handleAccount)
···
102
ContactEmail string
103
Relays []string
104
AdminPassword string
105
+
RequireInvite bool
106
107
SmtpUser string
108
SmtpPass string
···
127
EnforcePeering bool
128
Relays []string
129
AdminPassword string
130
+
RequireInvite bool
131
SmtpEmail string
132
SmtpName string
133
BlockstoreVariant BlockstoreVariant
···
381
EnforcePeering: false,
382
Relays: args.Relays,
383
AdminPassword: args.AdminPassword,
384
+
RequireInvite: args.RequireInvite,
385
SmtpName: args.SmtpName,
386
SmtpEmail: args.SmtpEmail,
387
BlockstoreVariant: args.BlockstoreVariant,
···
445
s.echo.GET("/", s.handleRoot)
446
s.echo.GET("/xrpc/_health", s.handleHealth)
447
s.echo.GET("/.well-known/did.json", s.handleWellKnown)
448
+
s.echo.GET("/.well-known/atproto-did", s.handleAtprotoDid)
449
s.echo.GET("/.well-known/oauth-protected-resource", s.handleOauthProtectedResource)
450
s.echo.GET("/.well-known/oauth-authorization-server", s.handleOauthAuthorizationServer)
451
s.echo.GET("/robots.txt", s.handleRobots)
···
469
s.echo.GET("/xrpc/com.atproto.sync.subscribeRepos", s.handleSyncSubscribeRepos)
470
s.echo.GET("/xrpc/com.atproto.sync.listBlobs", s.handleSyncListBlobs)
471
s.echo.GET("/xrpc/com.atproto.sync.getBlob", s.handleSyncGetBlob)
472
+
473
+
// labels
474
+
s.echo.GET("/xrpc/com.atproto.label.queryLabels", s.handleLabelQueryLabels)
475
476
// account
477
s.echo.GET("/account", s.handleAccount)