forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
Revert "Revert "*/config: add PLC URL config option""
This reverts commit 55b06460d331a29b940dd06c7518d9fd0a911cd2.
authored by
Seongmin Lee
and committed by
Tangled
d9a1bb76
8d768f5f
+44
-30
+5
appview/config/config.go
+5
appview/config/config.go
···
30
30
ClientKid string `env:"CLIENT_KID"`
31
31
}
32
32
33
+
type PlcConfig struct {
34
+
PLCURL string `env:"URL, default=https://plc.directory"`
35
+
}
36
+
33
37
type JetstreamConfig struct {
34
38
Endpoint string `env:"ENDPOINT, default=wss://jetstream1.us-east.bsky.network/subscribe"`
35
39
}
···
114
110
Avatar AvatarConfig `env:",prefix=TANGLED_AVATAR_"`
115
111
OAuth OAuthConfig `env:",prefix=TANGLED_OAUTH_"`
116
112
Redis RedisConfig `env:",prefix=TANGLED_REDIS_"`
113
+
Plc PlcConfig `env:",prefix=TANGLED_PLC_"`
117
114
Pds PdsConfig `env:",prefix=TANGLED_PDS_"`
118
115
Cloudflare Cloudflare `env:",prefix=TANGLED_CLOUDFLARE_"`
119
116
Label LabelConfig `env:",prefix=TANGLED_LABEL_"`
+2
-2
appview/state/state.go
+2
-2
appview/state/state.go
···
78
78
return nil, fmt.Errorf("failed to create enforcer: %w", err)
79
79
}
80
80
81
-
res, err := idresolver.RedisResolver(config.Redis.ToURL())
81
+
res, err := idresolver.RedisResolver(config.Redis.ToURL(), config.Plc.PLCURL)
82
82
if err != nil {
83
83
logger.Error("failed to create redis resolver", "err", err)
84
-
res = idresolver.DefaultResolver()
84
+
res = idresolver.DefaultResolver(config.Plc.PLCURL)
85
85
}
86
86
87
87
posthog, err := posthog.NewWithConfig(config.Posthog.ApiKey, posthog.Config{Endpoint: config.Posthog.Endpoint})
+9
-3
guard/guard.go
+9
-3
guard/guard.go
···
16
16
securejoin "github.com/cyphar/filepath-securejoin"
17
17
"github.com/urfave/cli/v3"
18
18
"tangled.org/core/idresolver"
19
+
"tangled.org/core/knotserver/config"
19
20
"tangled.org/core/log"
20
21
)
21
22
···
57
56
58
57
func Run(ctx context.Context, cmd *cli.Command) error {
59
58
l := log.FromContext(ctx)
59
+
60
+
c, err := config.Load(ctx)
61
+
if err != nil {
62
+
return fmt.Errorf("failed to load config: %w", err)
63
+
}
60
64
61
65
incomingUser := cmd.String("user")
62
66
gitDir := cmd.String("git-dir")
···
128
122
}
129
123
130
124
didOrHandle := components[0]
131
-
identity := resolveIdentity(ctx, l, didOrHandle)
125
+
identity := resolveIdentity(ctx, c, l, didOrHandle)
132
126
did := identity.DID.String()
133
127
repoName := components[1]
134
128
qualifiedRepoName, _ := securejoin.SecureJoin(did, repoName)
···
201
195
return nil
202
196
}
203
197
204
-
func resolveIdentity(ctx context.Context, l *slog.Logger, didOrHandle string) *identity.Identity {
205
-
resolver := idresolver.DefaultResolver()
198
+
func resolveIdentity(ctx context.Context, c *config.Config, l *slog.Logger, didOrHandle string) *identity.Identity {
199
+
resolver := idresolver.DefaultResolver(c.Server.PlcUrl)
206
200
ident, err := resolver.ResolveIdent(ctx, didOrHandle)
207
201
if err != nil {
208
202
l.Error("Error resolving handle", "error", err, "handle", didOrHandle)
+17
-8
idresolver/resolver.go
+17
-8
idresolver/resolver.go
···
17
17
directory identity.Directory
18
18
}
19
19
20
-
func BaseDirectory() identity.Directory {
20
+
func BaseDirectory(plcUrl string) identity.Directory {
21
21
base := identity.BaseDirectory{
22
-
PLCURL: identity.DefaultPLCURL,
22
+
PLCURL: plcUrl,
23
23
HTTPClient: http.Client{
24
24
Timeout: time.Second * 10,
25
25
Transport: &http.Transport{
···
42
42
return &base
43
43
}
44
44
45
-
func RedisDirectory(url string) (identity.Directory, error) {
45
+
func RedisDirectory(url, plcUrl string) (identity.Directory, error) {
46
46
hitTTL := time.Hour * 24
47
47
errTTL := time.Second * 30
48
48
invalidHandleTTL := time.Minute * 5
49
-
return redisdir.NewRedisDirectory(BaseDirectory(), url, hitTTL, errTTL, invalidHandleTTL, 10000)
49
+
return redisdir.NewRedisDirectory(
50
+
BaseDirectory(plcUrl),
51
+
url,
52
+
hitTTL,
53
+
errTTL,
54
+
invalidHandleTTL,
55
+
10000,
56
+
)
50
57
}
51
58
52
-
func DefaultResolver() *Resolver {
59
+
func DefaultResolver(plcUrl string) *Resolver {
60
+
base := BaseDirectory(plcUrl)
61
+
cached := identity.NewCacheDirectory(base, 250_000, time.Hour*24, time.Minute*2, time.Minute*5)
53
62
return &Resolver{
54
-
directory: identity.DefaultDirectory(),
63
+
directory: &cached,
55
64
}
56
65
}
57
66
58
-
func RedisResolver(redisUrl string) (*Resolver, error) {
59
-
directory, err := RedisDirectory(redisUrl)
67
+
func RedisResolver(redisUrl, plcUrl string) (*Resolver, error) {
68
+
directory, err := RedisDirectory(redisUrl, plcUrl)
60
69
if err != nil {
61
70
return nil, err
62
71
}
+1
knotserver/config/config.go
+1
knotserver/config/config.go
···
19
19
InternalListenAddr string `env:"INTERNAL_LISTEN_ADDR, default=127.0.0.1:5444"`
20
20
DBPath string `env:"DB_PATH, default=knotserver.db"`
21
21
Hostname string `env:"HOSTNAME, required"`
22
+
PlcUrl string `env:"PLC_URL, default=plc.directory"`
22
23
JetstreamEndpoint string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"`
23
24
Owner string `env:"OWNER, required"`
24
25
LogDids bool `env:"LOG_DIDS, default=true"`
+3
-7
knotserver/ingester.go
+3
-7
knotserver/ingester.go
···
16
16
"github.com/bluesky-social/jetstream/pkg/models"
17
17
securejoin "github.com/cyphar/filepath-securejoin"
18
18
"tangled.org/core/api/tangled"
19
-
"tangled.org/core/idresolver"
20
19
"tangled.org/core/knotserver/db"
21
20
"tangled.org/core/knotserver/git"
22
21
"tangled.org/core/log"
···
119
120
}
120
121
121
122
// resolve this aturi to extract the repo record
122
-
resolver := idresolver.DefaultResolver()
123
-
ident, err := resolver.ResolveIdent(ctx, repoAt.Authority().String())
123
+
ident, err := h.resolver.ResolveIdent(ctx, repoAt.Authority().String())
124
124
if err != nil || ident.Handle.IsInvalidHandle() {
125
125
return fmt.Errorf("failed to resolve handle: %w", err)
126
126
}
···
231
233
return err
232
234
}
233
235
234
-
resolver := idresolver.DefaultResolver()
235
-
236
-
subjectId, err := resolver.ResolveIdent(ctx, record.Subject)
236
+
subjectId, err := h.resolver.ResolveIdent(ctx, record.Subject)
237
237
if err != nil || subjectId.Handle.IsInvalidHandle() {
238
238
return err
239
239
}
240
240
241
241
// TODO: fix this for good, we need to fetch the record here unfortunately
242
242
// resolve this aturi to extract the repo record
243
-
owner, err := resolver.ResolveIdent(ctx, repoAt.Authority().String())
243
+
owner, err := h.resolver.ResolveIdent(ctx, repoAt.Authority().String())
244
244
if err != nil || owner.Handle.IsInvalidHandle() {
245
245
return fmt.Errorf("failed to resolve handle: %w", err)
246
246
}
+1
-1
knotserver/internal.go
+1
-1
knotserver/internal.go
+1
-1
knotserver/router.go
+1
-1
knotserver/router.go
+1
spindle/config/config.go
+1
spindle/config/config.go
···
13
13
DBPath string `env:"DB_PATH, default=spindle.db"`
14
14
Hostname string `env:"HOSTNAME, required"`
15
15
JetstreamEndpoint string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"`
16
+
PlcUrl string `env:"PLC_URL, default=plc.directory"`
16
17
Dev bool `env:"DEV, default=false"`
17
18
Owner string `env:"OWNER, required"`
18
19
Secrets Secrets `env:",prefix=SECRETS_"`
+3
-7
spindle/ingester.go
+3
-7
spindle/ingester.go
···
9
9
10
10
"tangled.org/core/api/tangled"
11
11
"tangled.org/core/eventconsumer"
12
-
"tangled.org/core/idresolver"
13
12
"tangled.org/core/rbac"
14
13
"tangled.org/core/spindle/db"
15
14
···
141
142
func (s *Spindle) ingestRepo(ctx context.Context, e *models.Event) error {
142
143
var err error
143
144
did := e.Did
144
-
resolver := idresolver.DefaultResolver()
145
145
146
146
l := s.l.With("component", "ingester", "record", tangled.RepoNSID)
147
147
···
188
190
}
189
191
190
192
// add collaborators to rbac
191
-
owner, err := resolver.ResolveIdent(ctx, did)
193
+
owner, err := s.res.ResolveIdent(ctx, did)
192
194
if err != nil || owner.Handle.IsInvalidHandle() {
193
195
return err
194
196
}
···
223
225
return err
224
226
}
225
227
226
-
resolver := idresolver.DefaultResolver()
227
-
228
-
subjectId, err := resolver.ResolveIdent(ctx, record.Subject)
228
+
subjectId, err := s.res.ResolveIdent(ctx, record.Subject)
229
229
if err != nil || subjectId.Handle.IsInvalidHandle() {
230
230
return err
231
231
}
···
236
240
237
241
// TODO: get rid of this entirely
238
242
// resolve this aturi to extract the repo record
239
-
owner, err := resolver.ResolveIdent(ctx, repoAt.Authority().String())
243
+
owner, err := s.res.ResolveIdent(ctx, repoAt.Authority().String())
240
244
if err != nil || owner.Handle.IsInvalidHandle() {
241
245
return fmt.Errorf("failed to resolve handle: %w", err)
242
246
}