forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
appview/oauth: use slog logger
Signed-off-by: oppiliappan <me@oppi.li>
+36
-30
+20
-17
appview/oauth/handler.go
+20
-17
appview/oauth/handler.go
···
5
5
"context"
6
6
"encoding/json"
7
7
"fmt"
8
-
"log"
9
8
"net/http"
10
9
"slices"
11
10
"time"
···
42
43
jwks := o.Config.OAuth.Jwks
43
44
pubKey, err := pubKeyFromJwk(jwks)
44
45
if err != nil {
45
-
log.Printf("error parsing public key: %v", err)
46
+
o.Logger.Error("error parsing public key", "err", err)
46
47
http.Error(w, err.Error(), http.StatusInternalServerError)
47
48
return
48
49
}
···
70
71
return
71
72
}
72
73
73
-
log.Println("session saved successfully")
74
+
o.Logger.Debug("session saved successfully")
74
75
go o.addToDefaultKnot(sessData.AccountDID.String())
75
76
go o.addToDefaultSpindle(sessData.AccountDID.String())
76
77
···
80
81
Event: "signin",
81
82
})
82
83
if err != nil {
83
-
log.Println("failed to enqueue posthog event:", err)
84
+
o.Logger.Error("failed to enqueue posthog event", "err", err)
84
85
}
85
86
}
86
87
···
88
89
}
89
90
90
91
func (o *OAuth) addToDefaultSpindle(did string) {
92
+
l := o.Logger.With("subject", did)
93
+
91
94
// use the tangled.sh app password to get an accessJwt
92
95
// and create an sh.tangled.spindle.member record with that
93
96
spindleMembers, err := db.GetSpindleMembers(
···
98
97
db.FilterEq("subject", did),
99
98
)
100
99
if err != nil {
101
-
log.Printf("failed to get spindle members for did %s: %v", did, err)
100
+
l.Error("failed to get spindle members", "err", err)
102
101
return
103
102
}
104
103
105
104
if len(spindleMembers) != 0 {
106
-
log.Printf("did %s is already a member of the default spindle", did)
105
+
l.Warn("already a member of the default spindle")
107
106
return
108
107
}
109
108
110
-
log.Printf("adding %s to default spindle", did)
109
+
l.Debug("adding to default spindle")
111
110
session, err := o.createAppPasswordSession(o.Config.Core.AppPassword, consts.TangledDid)
112
111
if err != nil {
113
-
log.Printf("failed to create session: %s", err)
112
+
l.Error("failed to create session", "err", err)
114
113
return
115
114
}
116
115
···
122
121
}
123
122
124
123
if err := session.putRecord(record, tangled.SpindleMemberNSID); err != nil {
125
-
log.Printf("failed to add member to default spindle: %s", err)
124
+
l.Error("failed to add to default spindle", "err", err)
126
125
return
127
126
}
128
127
129
-
log.Printf("successfully added %s to default spindle", did)
128
+
l.Debug("successfully added to default spindle", "did", did)
130
129
}
131
130
132
131
func (o *OAuth) addToDefaultKnot(did string) {
132
+
l := o.Logger.With("subject", did)
133
+
133
134
// use the tangled.sh app password to get an accessJwt
134
135
// and create an sh.tangled.spindle.member record with that
135
136
136
137
allKnots, err := o.Enforcer.GetKnotsForUser(did)
137
138
if err != nil {
138
-
log.Printf("failed to get knot members for did %s: %v", did, err)
139
+
l.Error("failed to get knot members for did", "err", err)
139
140
return
140
141
}
141
142
142
143
if slices.Contains(allKnots, consts.DefaultKnot) {
143
-
log.Printf("did %s is already a member of the default knot", did)
144
+
l.Warn("already a member of the default knot")
144
145
return
145
146
}
146
147
147
-
log.Printf("adding %s to default knot", did)
148
+
l.Debug("addings to default knot")
148
149
session, err := o.createAppPasswordSession(o.Config.Core.TmpAltAppPassword, consts.IcyDid)
149
150
if err != nil {
150
-
log.Printf("failed to create session: %s", err)
151
+
l.Error("failed to create session", "err", err)
151
152
return
152
153
}
153
154
···
161
158
}
162
159
163
160
if err := session.putRecord(record, tangled.KnotMemberNSID); err != nil {
164
-
log.Printf("failed to add member to default knot: %s", err)
161
+
l.Error("failed to add to default knot", "err", err)
165
162
return
166
163
}
167
164
168
165
if err := o.Enforcer.AddKnotMember(consts.DefaultKnot, did); err != nil {
169
-
log.Printf("failed to set up enforcer rules: %s", err)
166
+
l.Error("failed to set up enforcer rules", "err", err)
170
167
return
171
168
}
172
169
173
-
log.Printf("successfully added %s to default Knot", did)
170
+
l.Debug("successfully addeds to default Knot")
174
171
}
175
172
176
173
// create a session using apppasswords
+15
-12
appview/oauth/oauth.go
+15
-12
appview/oauth/oauth.go
···
3
3
import (
4
4
"errors"
5
5
"fmt"
6
+
"log/slog"
6
7
"net/http"
7
8
"time"
8
9
···
21
20
"tangled.org/core/rbac"
22
21
)
23
22
24
-
func New(config *config.Config, ph posthog.Client, db *db.DB, enforcer *rbac.Enforcer, res *idresolver.Resolver) (*OAuth, error) {
23
+
type OAuth struct {
24
+
ClientApp *oauth.ClientApp
25
+
SessStore *sessions.CookieStore
26
+
Config *config.Config
27
+
JwksUri string
28
+
Posthog posthog.Client
29
+
Db *db.DB
30
+
Enforcer *rbac.Enforcer
31
+
IdResolver *idresolver.Resolver
32
+
Logger *slog.Logger
33
+
}
34
+
35
+
func New(config *config.Config, ph posthog.Client, db *db.DB, enforcer *rbac.Enforcer, res *idresolver.Resolver, logger *slog.Logger) (*OAuth, error) {
25
36
26
37
var oauthConfig oauth.ClientConfig
27
38
var clientUri string
···
67
54
Db: db,
68
55
Enforcer: enforcer,
69
56
IdResolver: res,
57
+
Logger: logger,
70
58
}, nil
71
-
}
72
-
73
-
type OAuth struct {
74
-
ClientApp *oauth.ClientApp
75
-
SessStore *sessions.CookieStore
76
-
Config *config.Config
77
-
JwksUri string
78
-
Posthog posthog.Client
79
-
Db *db.DB
80
-
Enforcer *rbac.Enforcer
81
-
IdResolver *idresolver.Resolver
82
59
}
83
60
84
61
func (o *OAuth) SaveSession(w http.ResponseWriter, r *http.Request, sessData *oauth.ClientSessionData) error {
+1
-1
appview/state/state.go
+1
-1
appview/state/state.go
···
82
82
}
83
83
84
84
pages := pages.NewPages(config, res, log.SubLogger(logger, "pages"))
85
-
oauth, err := oauth.New(config, posthog, d, enforcer, res)
85
+
oauth, err := oauth.New(config, posthog, d, enforcer, res, log.SubLogger(logger, "oauth"))
86
86
if err != nil {
87
87
return nil, fmt.Errorf("failed to start oauth handler: %w", err)
88
88
}