Skip to content

Commit

Permalink
disallow negative values in ExtendExpiry, fix nil map err
Browse files Browse the repository at this point in the history
  • Loading branch information
hrfee committed Apr 6, 2021
1 parent afedc78 commit 8a6cfe0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
8 changes: 5 additions & 3 deletions api.go
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ func (app *appContext) ExtendExpiry(gc *gin.Context) {
var req extendExpiryDTO
gc.BindJSON(&req)
app.info.Printf("Expiry extension requested for %d user(s)", len(req.Users))
if req.Days == 0 && req.Hours == 0 && req.Minutes == 0 {
if req.Days <= 0 && req.Hours <= 0 && req.Minutes <= 0 {
respondBool(400, false, gc)
return
}
Expand Down Expand Up @@ -1024,13 +1024,14 @@ func (app *appContext) DeleteInvite(gc *gin.Context) {
func (app *appContext) GetUsers(gc *gin.Context) {
app.debug.Println("Users requested")
var resp getUsersDTO
resp.UserList = []respUser{}
users, status, err := app.jf.GetUsers(false)
resp.UserList = make([]respUser, len(users))
if !(status == 200 || status == 204) || err != nil {
app.err.Printf("Failed to get users from Jellyfin (%d): %v", status, err)
respond(500, "Couldn't get users", gc)
return
}
i := 0
for _, jfUser := range users {
user := respUser{
ID: jfUser.ID,
Expand All @@ -1049,7 +1050,8 @@ func (app *appContext) GetUsers(gc *gin.Context) {
user.Expiry = app.formatDatetime(expiry)
}

resp.UserList = append(resp.UserList, user)
resp.UserList[i] = user
i++
}
gc.JSON(200, resp)
}
Expand Down
3 changes: 3 additions & 0 deletions storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,9 @@ func (st *Storage) storeInvites() error {
}

func (st *Storage) loadUsers() error {
if st.users == nil {
st.users = map[string]time.Time{}
}
st.usersLock.Lock()
defer st.usersLock.Unlock()
temp := map[string]time.Time{}
Expand Down

0 comments on commit 8a6cfe0

Please sign in to comment.