mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-06 10:00:26 +00:00
Code Issues Releases Wiki Activity

Mark user's source: local or telegram

Browse Source
This commit is contained in:
bouncepaw 2021-07-14 21:00:35 +00:00
parent 8059674925
commit 5e450612a1
8 changed files with 95 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flag.go
View File

@ -88,7 +88,7 @@ func createAdminCommand(name string) {
password := string(passwordBytes)
log.SetOutput(io.Discard)
err = user.Register(name, password, "admin", true)
err = user.Register(name, password, "admin", "local", true)
log.SetOutput(wr)
if err != nil {

3
user/files.go
View File

@ -40,6 +40,9 @@ func usersFromFile() []*User {
}
for _, u := range users {
u.Name = util.CanonicalName(u.Name)
if u.Source == "" {
u.Source = "local"
}
}
log.Println("Found", len(users), "users")
return users

5
user/net.go
View File

@ -40,7 +40,7 @@ func LogoutFromRequest(w http.ResponseWriter, rq *http.Request) {
}
// Register registers the given user. If it fails, a non-nil error is returned.
func Register(username, password, group string, force bool) error {
func Register(username, password, group, source string, force bool) error {
username = util.CanonicalName(username)
switch {
@ -48,6 +48,8 @@ func Register(username, password, group string, force bool) error {
return fmt.Errorf("illegal username \"%s\"", username)
case !ValidGroup(group):
return fmt.Errorf("invalid group \"%s\"", group)
case !ValidSource(source):
return fmt.Errorf("invalid source \"%s\"", source)
case HasUsername(username):
return fmt.Errorf("username \"%s\" is already taken", username)
case !force && cfg.RegistrationLimit > 0 && Count() >= cfg.RegistrationLimit:
@ -62,6 +64,7 @@ func Register(username, password, group string, force bool) error {
u := User{
Name: username,
Group: group,
Source: source,
Password: string(hash),
RegisteredAt: time.Now(),
}

11
user/user.go
View File

@ -16,6 +16,8 @@ type User struct {
Group string `json:"group"`
Password string `json:"hashed_password"`
RegisteredAt time.Time `json:"registered_on"`
// Source is where the user from. Valid values: valid, telegram.
Source string `json:"source"`
sync.RWMutex
// A note about why HashedPassword is string and not []byte. The reason is
@ -44,17 +46,15 @@ var groups = []string{
"anon",
"editor",
"trusted",
"telegram",
"moderator",
"admin",
}
// Group — Right
// Group — Right level
var groupRight = map[string]int{
"anon": 0,
"editor": 1,
"trusted": 2,
"telegram": 2,
"moderator": 3,
"admin": 4,
}
@ -68,11 +68,16 @@ func ValidGroup(group string) bool {
return false
}
func ValidSource(source string) bool {
return source == "local" || source == "telegram"
}
func EmptyUser() *User {
return &User{
Name: "anon",
Group: "anon",
Password: "",
Source: "local",
}
}

4
views/admin.qtpl
View File

@ -142,9 +142,6 @@
</div>
{% endif %}
{% if f.Get("group") == "telegram" %}
<p>This user is authorized using Telegram, they have the same rights as <i>trusted</i> editors. You cannot change their group.</p>
{% else %}
<form action="" method="post">
<div class="form-field">
<select id="group" name="group" aria-label="Group">
@ -160,7 +157,6 @@
<button class="btn" type="submit">Update</button>
</div>
</form>
{% endif %}
<h2>Delete user</h2>
<p>Remove the user from the database. Changes made by the user will

166
views/admin.qtpl.go
View File

@ -382,65 +382,54 @@ func StreamAdminUserEditHTML(qw422016 *qt422016.Writer, u *user.User, f util.For
//line views/admin.qtpl:143
qw422016.N().S(`
`)
//line views/admin.qtpl:145
if f.Get("group") == "telegram" {
//line views/admin.qtpl:145
qw422016.N().S(`
<p>This user is authorized using Telegram, they have the same rights as <i>trusted</i> editors. You cannot change their group.</p>
`)
//line views/admin.qtpl:147
} else {
//line views/admin.qtpl:147
qw422016.N().S(`
<form action="" method="post">
<div class="form-field">
<select id="group" name="group" aria-label="Group">
<option`)
//line views/admin.qtpl:148
if f.Get("group") == "anon" {
//line views/admin.qtpl:148
qw422016.N().S(` selected`)
//line views/admin.qtpl:148
}
//line views/admin.qtpl:148
qw422016.N().S(`>anon</option>
<option`)
//line views/admin.qtpl:149
if f.Get("group") == "editor" {
//line views/admin.qtpl:149
qw422016.N().S(` selected`)
//line views/admin.qtpl:149
}
//line views/admin.qtpl:149
qw422016.N().S(`>editor</option>
<option`)
//line views/admin.qtpl:150
if f.Get("group") == "trusted" {
//line views/admin.qtpl:150
qw422016.N().S(` selected`)
//line views/admin.qtpl:150
}
//line views/admin.qtpl:150
qw422016.N().S(`>trusted</option>
<option`)
//line views/admin.qtpl:151
if f.Get("group") == "anon" {
if f.Get("group") == "moderator" {
//line views/admin.qtpl:151
qw422016.N().S(` selected`)
qw422016.N().S(` selected`)
//line views/admin.qtpl:151
}
}
//line views/admin.qtpl:151
qw422016.N().S(`>anon</option>
qw422016.N().S(`>moderator</option>
<option`)
//line views/admin.qtpl:152
if f.Get("group") == "editor" {
if f.Get("group") == "admin" {
//line views/admin.qtpl:152
qw422016.N().S(` selected`)
qw422016.N().S(` selected`)
//line views/admin.qtpl:152
}
}
//line views/admin.qtpl:152
qw422016.N().S(`>editor</option>
<option`)
//line views/admin.qtpl:153
if f.Get("group") == "trusted" {
//line views/admin.qtpl:153
qw422016.N().S(` selected`)
//line views/admin.qtpl:153
}
//line views/admin.qtpl:153
qw422016.N().S(`>trusted</option>
<option`)
//line views/admin.qtpl:154
if f.Get("group") == "moderator" {
//line views/admin.qtpl:154
qw422016.N().S(` selected`)
//line views/admin.qtpl:154
}
//line views/admin.qtpl:154
qw422016.N().S(`>moderator</option>
<option`)
//line views/admin.qtpl:155
if f.Get("group") == "admin" {
//line views/admin.qtpl:155
qw422016.N().S(` selected`)
//line views/admin.qtpl:155
}
//line views/admin.qtpl:155
qw422016.N().S(`>admin</option>
qw422016.N().S(`>admin</option>
</select>
</div>
@ -448,122 +437,117 @@ func StreamAdminUserEditHTML(qw422016 *qt422016.Writer, u *user.User, f util.For
<button class="btn" type="submit">Update</button>
</div>
</form>
`)
//line views/admin.qtpl:163
}
//line views/admin.qtpl:163
qw422016.N().S(`
<h2>Delete user</h2>
<p>Remove the user from the database. Changes made by the user will
be preserved. It will be possible to take this username later.</p>
<a class="btn btn_destructive" href="/admin/users/`)
//line views/admin.qtpl:168
//line views/admin.qtpl:164
qw422016.N().U(u.Name)
//line views/admin.qtpl:168
//line views/admin.qtpl:164
qw422016.N().S(`/delete">Delete</a>
</main>
</div>
`)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
}
//line views/admin.qtpl:171
//line views/admin.qtpl:167
func WriteAdminUserEditHTML(qq422016 qtio422016.Writer, u *user.User, f util.FormData) {
//line views/admin.qtpl:171
//line views/admin.qtpl:167
qw422016 := qt422016.AcquireWriter(qq422016)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
StreamAdminUserEditHTML(qw422016, u, f)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
qt422016.ReleaseWriter(qw422016)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
}
//line views/admin.qtpl:171
//line views/admin.qtpl:167
func AdminUserEditHTML(u *user.User, f util.FormData) string {
//line views/admin.qtpl:171
//line views/admin.qtpl:167
qb422016 := qt422016.AcquireByteBuffer()
//line views/admin.qtpl:171
//line views/admin.qtpl:167
WriteAdminUserEditHTML(qb422016, u, f)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
qs422016 := string(qb422016.B)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
qt422016.ReleaseByteBuffer(qb422016)
//line views/admin.qtpl:171
//line views/admin.qtpl:167
return qs422016
//line views/admin.qtpl:171
//line views/admin.qtpl:167
}
//line views/admin.qtpl:173
//line views/admin.qtpl:169
func StreamAdminUserDeleteHTML(qw422016 *qt422016.Writer, u *user.User, f util.FormData) {
//line views/admin.qtpl:173
//line views/admin.qtpl:169
qw422016.N().S(`
<div class="layout">
<main class="main-width form-wrap">
<h1>Delete user</h1>
`)
//line views/admin.qtpl:178
//line views/admin.qtpl:174
if f.HasError() {
//line views/admin.qtpl:178
//line views/admin.qtpl:174
qw422016.N().S(`
<div class="notice notice--error">
<strong>Error:</strong>
`)
//line views/admin.qtpl:181
//line views/admin.qtpl:177
qw422016.E().S(f.Error())
//line views/admin.qtpl:181
//line views/admin.qtpl:177
qw422016.N().S(`
</div>
`)
//line views/admin.qtpl:183
//line views/admin.qtpl:179
}
//line views/admin.qtpl:183
//line views/admin.qtpl:179
qw422016.N().S(`
<p>Are you sure you want to delete <strong>`)
//line views/admin.qtpl:185
//line views/admin.qtpl:181
qw422016.E().S(u.Name)
//line views/admin.qtpl:185
//line views/admin.qtpl:181
qw422016.N().S(`</strong>
from the database? This action is irreversible.</p>
<form action="" method="post">
<button class="btn btn_destructive" type="submit">Delete</button>
<a class="btn btn_weak" href="/admin/users/`)
//line views/admin.qtpl:190
//line views/admin.qtpl:186
qw422016.N().U(u.Name)
//line views/admin.qtpl:190
//line views/admin.qtpl:186
qw422016.N().S(`/edit">Cancel</a>
</form>
</main>
</div>
`)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
}
//line views/admin.qtpl:194
//line views/admin.qtpl:190
func WriteAdminUserDeleteHTML(qq422016 qtio422016.Writer, u *user.User, f util.FormData) {
//line views/admin.qtpl:194
//line views/admin.qtpl:190
qw422016 := qt422016.AcquireWriter(qq422016)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
StreamAdminUserDeleteHTML(qw422016, u, f)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
qt422016.ReleaseWriter(qw422016)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
}
//line views/admin.qtpl:194
//line views/admin.qtpl:190
func AdminUserDeleteHTML(u *user.User, f util.FormData) string {
//line views/admin.qtpl:194
//line views/admin.qtpl:190
qb422016 := qt422016.AcquireByteBuffer()
//line views/admin.qtpl:194
//line views/admin.qtpl:190
WriteAdminUserDeleteHTML(qb422016, u, f)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
qs422016 := string(qb422016.B)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
qt422016.ReleaseByteBuffer(qb422016)
//line views/admin.qtpl:194
//line views/admin.qtpl:190
return qs422016
//line views/admin.qtpl:194
//line views/admin.qtpl:190
}

2
web/admin.go
View File

@ -192,7 +192,7 @@ func handlerAdminUserNew(w http.ResponseWriter, rq *http.Request) {
// Create a user
f := util.FormDataFromRequest(rq, []string{"name", "password", "group"})
err := user.Register(f.Get("name"), f.Get("password"), f.Get("group"), true)
err := user.Register(f.Get("name"), f.Get("password"), f.Get("group"), "local", true)
if err != nil {
html := views.AdminUserNewHTML(f.WithError(err))

5
web/auth.go
View File

@ -58,7 +58,7 @@ func handlerRegister(w http.ResponseWriter, rq *http.Request) {
var (
username = rq.PostFormValue("username")
password = rq.PostFormValue("password")
err = user.Register(username, password, "editor", false)
err = user.Register(username, password, "editor", "local", false)
)
if err != nil {
log.Printf("Failed to register \"%s\": %s", username, err.Error())
@ -134,11 +134,12 @@ func handlerTelegramLogin(w http.ResponseWriter, rq *http.Request) {
err = user.Register(
username,
"", // Password matters not
"editor",
"telegram",
false,
)
)
if user.HasUsername(username) && user.UserByName(username).Group == "telegram" {
if user.HasUsername(username) && user.UserByName(username).Source == "telegram" {
// Problems is something we put blankets on.
err = nil
}