Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KSP-SpaceDock/SpaceDock-Backend
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e3935c82bc3c
Choose a base ref
...
head repository: KSP-SpaceDock/SpaceDock-Backend
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 074618ecbc04
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 19, 2017

  1. Use urls that will actually work

    Dorian Stoll committed Mar 19, 2017
    Copy the full SHA
    5f727bc View commit details
  2. Redo the ability adding for the dummy admin users

    Also: Modlists instead of Modpacks
    Dorian Stoll committed Mar 19, 2017
    Copy the full SHA
    deb5216 View commit details
  3. First part of the modpack routes

    Dorian Stoll committed Mar 19, 2017
    Copy the full SHA
    074618e View commit details
Showing with 241 additions and 39 deletions.
  1. +21 −27 sdb.go
  2. +1 −1 src/SpaceDock/routes/accounts.go
  3. +11 −11 src/SpaceDock/routes/featured.go
  4. +208 −0 src/SpaceDock/routes/modlists.go
48 changes: 21 additions & 27 deletions sdb.go
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ import (
"SpaceDock/objects"
_ "SpaceDock/routes"
"strconv"
"regexp"
)

/*
@@ -43,6 +44,16 @@ func CreateDefaultData() {
NewDummyVersion(*fac, "0.12", false)
}

func AddAbilityRe(role *objects.Role, expression string) {
var abilities []objects.Ability
SpaceDock.Database.Find(&abilities)
for _,element := range abilities {
if ok,_ := regexp.MatchString(expression, element.Name); ok {
role.AddAbility(element.Name)
}
}
}

func NewDummyUser(name string, password string, email string, admin bool) *objects.User {
user := objects.NewUser(name, email, password)
SpaceDock.Database.Save(user)
@@ -51,50 +62,33 @@ func NewDummyUser(name string, password string, email string, admin bool) *objec
role := user.AddRole(user.Username)
role.AddAbility("user-edit")
role.AddAbility("mods-add")
role.AddAbility("packs-add")
role.AddAbility("lists-add")
role.AddAbility("logged-in")
role.AddParam("user-edit", "userid", strconv.Itoa(int(user.ID)))
role.AddParam("mods-add", "gameshort", ".*")
role.AddParam("packs-add", "gameshort", ".*")
role.AddParam("lists-add", "gameshort", ".*")
SpaceDock.Database.Save(&role)

// Admin roles
if admin {
admin_role := user.AddRole("admin")

// access.go
admin_role.AddAbility("access-view")
admin_role.AddAbility("access-edit")

// admin.go
admin_role.AddAbility("admin-impersonate")
admin_role.AddAbility("admin-confirm")

// game.go
admin_role.AddAbility("game-add")
admin_role.AddAbility("game-edit")
admin_role.AddAbility("game-remove")

// tokens.go
admin_role.AddAbility("token-generate")
admin_role.AddAbility("token-edit")
admin_role.AddAbility("token-revoke")

// user.go
admin_role.AddAbility("user-edit")
AddAbilityRe(admin_role, ".*")
admin_role.AddAbility("mods-invite")
admin_role.AddAbility("view-users-full")

// Params
admin_role.AddParam("admin-impersonate", "userid", ".*")
admin_role.AddParam("game-edit", "gameshort", ".*")
admin_role.AddParam("game-add", "pubid", ".*")
admin_role.AddParam("game-remove", "short", ".*")
//admin_role.AddParam("mods-feature", "gameshort", ".*")
admin_role.AddParam("mods-feature", "gameshort", ".*")
//admin_role.AddParam("mods-edit", "gameshort", ".*")
//admin_role.AddParam("mods-add", "gameshort", ".*")
//admin_role.AddParam("mods-remove", "gameshort", ".*")
//admin_role.AddParam("packs-add", "gameshort", ".*")
//admin_role.AddParam("packs-remove", "gameshort", ".*")
//admin_role.AddParam("publisher-edit", "publid", ".*")
admin_role.AddParam("lists-add", "gameshort", ".*")
admin_role.AddParam("lists-edit", "gameshort", ".*")
admin_role.AddParam("lists-remove", "gameshort", ".*")
admin_role.AddParam("publisher-edit", "publid", ".*")
admin_role.AddParam("token-edit", "tokenid", ".*")
admin_role.AddParam("token-remove", "tokenid", ".*")
admin_role.AddParam("user-edit", "userid", ".*")
2 changes: 1 addition & 1 deletion src/SpaceDock/routes/accounts.go
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ func confirm(ctx *iris.Context) {
role := user.AddRole(user.Username)
role.AddAbility("user-edit")
role.AddAbility("mods-add")
role.AddAbility("packs-add")
role.AddAbility("lists-add")
role.AddAbility("logged-in")
role.AddParam("user-edit", "userid", strconv.Itoa(int(user.ID)))
role.AddParam("mods-add", "gameshort", ".*")
22 changes: 11 additions & 11 deletions src/SpaceDock/routes/featured.go
Original file line number Diff line number Diff line change
@@ -9,32 +9,32 @@
package routes

import (
"gopkg.in/kataras/iris.v6"
"SpaceDock/objects"
"SpaceDock"
"SpaceDock/middleware"
"SpaceDock/objects"
"SpaceDock/utils"
"github.com/spf13/cast"
"SpaceDock/middleware"
"gopkg.in/kataras/iris.v6"
)

/*
Registers the routes for the featured section
*/
func FeaturedRegister() {
Register(GET, "/api/mods/featured", list_featured)
Register(GET, "/api/mods/featured/:gameshort", list_featured_game)
Register(POST, "/api/mods/featured/:gameshort",
Register(GET, "/api/featured", list_featured)
Register(GET, "/api/featured/:gameshort", list_featured_game)
Register(POST, "/api/featured/:gameshort",
middleware.NeedsPermission("mods-feature", true, "gameshort"),
add_featured,
)
Register(DELETE, "/api/mods/featured/:gameshort",
Register(DELETE, "/api/featured/:gameshort",
middleware.NeedsPermission("mods-feature", true, "gameshort"),
remove_featured,
)
}

/*
Path: /api/mods/featured
Path: /api/featured
Method: GET
Description: Returns a list of featured mods.
*/
@@ -49,7 +49,7 @@ func list_featured(ctx *iris.Context) {
}

/*
Path: /api/mods/featured/:gameshort
Path: /api/featured/:gameshort
Method: GET
Description: Returns a list of featured mods for a specific game.
*/
@@ -76,7 +76,7 @@ func list_featured_game(ctx *iris.Context) {
}

/*
Path: /api/mods/featured/:gameshort
Path: /api/featured/:gameshort
Method: POST
Description: Features a mod for this game. Required fields: modid
Abilities: mods-feature
@@ -115,7 +115,7 @@ func add_featured(ctx *iris.Context) {
}

/*
Path: /api/mods/featured/:gameshort
Path: /api/featured/:gameshort
Method: DELETE
Description: Unfeatures a mod for this game. Required fields: modid
Abilities: mods-feature
208 changes: 208 additions & 0 deletions src/SpaceDock/routes/modlists.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
/*
SpaceDock Backend
API Backend for the SpaceDock infrastructure to host modfiles for various games
SpaceDock Backend is licensed under the Terms of the MIT License.
Copyright (c) 2017 Dorian Stoll (StollD), RockyTV
*/

package routes

import (
"SpaceDock"
"SpaceDock/middleware"
"SpaceDock/objects"
"SpaceDock/utils"
"github.com/spf13/cast"
"gopkg.in/kataras/iris.v6"
)

/*
Registers the routes for the modlist section
*/
func ModlistsRegister() {
Register(GET, "/api/lists", list_modlists)
Register(GET, "/api/lists/:gameshort", list_modlists_game)
Register(GET, "/api/lists/:gameshort/:listid", list_info)
Register(POST, "/api/lists",
middleware.NeedsPermission("lists-add", true, "gameshort"),
lists_add,
)
Register(PUT, "/api/lists/:gameshort/:listid",
middleware.NeedsPermission("lists-edit", true, "gameshort", "listid"),
list_edit,
)
Register(DELETE, "/api/lists/:gameshort/:listid",
middleware.NeedsPermission("lists-remove", true, "gameshort", "listid"),
list_remove,
)
}

/*
Path: /api/lists/
Method: GET
Description: Outputs a list of modlists
*/
func list_modlists(ctx *iris.Context) {
var modlists []objects.ModList
SpaceDock.Database.Find(&modlists)
output := make([]map[string]interface{}, len(modlists))
for i,element := range modlists {
output[i] = utils.ToMap(element)
}
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false, "count": len(output), "data": output})
}

/*
Path: /api/lists/:gameshort
Method: GET
Description: Outputs a list of modlists for a specific game
*/
func list_modlists_game(ctx *iris.Context) {
gameshort := ctx.GetString("gameshort")
var modlists []objects.ModList
SpaceDock.Database.Find(&modlists)
output := []map[string]interface{}{}
for _,element := range modlists {
if element.Game.Short == gameshort {
output = append(output, utils.ToMap(element))
}
}
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false, "count": len(output), "data": output})
}

/*
Path: /api/lists/:gameshort/:listid
Method: GET
Description: Returns info for a specific modlist
*/
func list_info(ctx *iris.Context) {
// Get params
gameshort := ctx.GetString("gameshort")
listid := cast.ToUint(ctx.GetString("listid"))

// Get the modlist
modlist := &objects.ModList{}
SpaceDock.Database.Where("id = ?", listid).First(modlist)
if modlist.ID != listid {
utils.WriteJSON(ctx, iris.StatusNotFound, utils.Error("The pack ID is invalid").Code(2135))
return
}
if modlist.Game.Short != gameshort {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("The gameshort is invalid.").Code(2125))
return
}
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false, "count": 1, "data": utils.ToMap(modlist)})
}

/*
Path: /api/lists
Method: POST
Description: Creates a new modlist. Required fields: name, gameshort
*/
func lists_add(ctx *iris.Context) {
// Get params
name := cast.ToString(utils.GetJSON(ctx, "name"))
gameshort := cast.ToString(utils.GetJSON(ctx, "gameshort"))

// Check the vars
errors := []string{}
codes := []int{}
if name == "" {
errors = append(errors, "Invalid modlist name.")
codes = append(codes, 2137)
}
modlist := &objects.ModList{}
SpaceDock.Database.Where("name = ?", name).First(modlist)
if modlist.Name == name {
errors = append(errors, "A modlist with this name already exists.")
codes = append(codes, 2025)
}
game := &objects.Game{}
SpaceDock.Database.Where("short = ?", gameshort).First(game)
if game.Short != gameshort {
errors = append(errors, "Invalid gameshort.")
codes = append(codes, 2125)
}
if len(errors) > 0 {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error(errors...).Code(codes...))
return
}

// Make a new list
user := middleware.CurrentUser(ctx)
modlist = objects.NewModList(name, *user, *game)
SpaceDock.Database.Save(modlist)
role := user.AddRole(name)
role.AddAbility("lists-edit")
role.AddAbility("lists-remove")
role.AddParam("lists-edit", "listsid", cast.ToString(modlist.ID))
role.AddParam("lists-remove", "name", name)
SpaceDock.Database.Save(user).Save(role)
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false, "count": 1, "data": utils.ToMap(modlist)})
}

/*
Path: /api/lists/:gameshort/:listid
Method: PUT
Description: Edits a modlist based on patch data. Required fields: data
*/
func list_edit(ctx *iris.Context) {
// Get params
gameshort := ctx.GetString("gameshort")
listid := cast.ToUint(ctx.GetString("listid"))

// Get the modlist
modlist := &objects.ModList{}
SpaceDock.Database.Where("id = ?", listid).First(modlist)
if modlist.ID != listid {
utils.WriteJSON(ctx, iris.StatusNotFound, utils.Error("The pack ID is invalid").Code(2135))
return
}
if modlist.Game.Short != gameshort {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("The gameshort is invalid.").Code(2125))
return
}

// Edit the modlist
code := utils.EditObject(modlist, utils.GetFullJSON(ctx))
if code == 3 {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("The value you submitted is invalid").Code(2180))
return
} else if code == 2 {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("You tried to edit a value that doesn't exist.").Code(3090))
return
} else if code == 1 {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("You tried to edit a value that is marked as read-only.").Code(3095))
return
}
SpaceDock.Database.Save(modlist)
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false, "count": 1, "data": utils.ToMap(modlist)})
}

/*
Path: /api/lists/:gameshort/:listid
Method: DELETE
Description: Removes a modlist
*/
func list_remove(ctx *iris.Context) {
// Get params
gameshort := ctx.GetString("gameshort")
listid := cast.ToUint(ctx.GetString("listid"))

// Get the modlist
modlist := &objects.ModList{}
SpaceDock.Database.Where("id = ?", listid).First(modlist)
if modlist.ID != listid {
utils.WriteJSON(ctx, iris.StatusNotFound, utils.Error("The pack ID is invalid").Code(2135))
return
}
if modlist.Game.Short != gameshort {
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("The gameshort is invalid.").Code(2125))
return
}

// Remove the modlist
SpaceDock.Database.Delete(modlist)
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false})
}