-
Notifications
You must be signed in to change notification settings - Fork 562
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:snapcore/snapd into tweak/refacto…
…r-sc-main-4
- Loading branch information
Showing
20 changed files
with
645 additions
and
438 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // -*- Mode: Go; indent-tabs-mode: t -*- | ||
|
|
||
| /* | ||
| * Copyright (C) 2016-2019 Canonical Ltd | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 3 as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| package daemon | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/snapcore/snapd/asserts" | ||
| "github.com/snapcore/snapd/overlord/assertstate" | ||
| "github.com/snapcore/snapd/overlord/auth" | ||
| ) | ||
|
|
||
| var ( | ||
| // TODO: allow to post assertions for UserOK? they are verified anyway | ||
| assertsCmd = &Command{ | ||
| Path: "/v2/assertions", | ||
| UserOK: true, | ||
| GET: getAssertTypeNames, | ||
| POST: doAssert, | ||
| } | ||
|
|
||
| assertsFindManyCmd = &Command{ | ||
| Path: "/v2/assertions/{assertType}", | ||
| UserOK: true, | ||
| GET: assertsFindMany, | ||
| } | ||
| ) | ||
|
|
||
| func getAssertTypeNames(c *Command, r *http.Request, user *auth.UserState) Response { | ||
| return SyncResponse(map[string][]string{ | ||
| "types": asserts.TypeNames(), | ||
| }, nil) | ||
| } | ||
|
|
||
| func doAssert(c *Command, r *http.Request, user *auth.UserState) Response { | ||
| batch := assertstate.NewBatch() | ||
| _, err := batch.AddStream(r.Body) | ||
| if err != nil { | ||
| return BadRequest("cannot decode request body into assertions: %v", err) | ||
| } | ||
|
|
||
| state := c.d.overlord.State() | ||
| state.Lock() | ||
| defer state.Unlock() | ||
|
|
||
| if err := batch.Commit(state); err != nil { | ||
| return BadRequest("assert failed: %v", err) | ||
| } | ||
| // TODO: what more info do we want to return on success? | ||
| return &resp{ | ||
| Type: ResponseTypeSync, | ||
| Status: 200, | ||
| } | ||
| } | ||
|
|
||
| func assertsFindMany(c *Command, r *http.Request, user *auth.UserState) Response { | ||
| assertTypeName := muxVars(r)["assertType"] | ||
| assertType := asserts.Type(assertTypeName) | ||
| if assertType == nil { | ||
| return BadRequest("invalid assert type: %q", assertTypeName) | ||
| } | ||
| headers := map[string]string{} | ||
| q := r.URL.Query() | ||
| for k := range q { | ||
| headers[k] = q.Get(k) | ||
| } | ||
|
|
||
| state := c.d.overlord.State() | ||
| state.Lock() | ||
| db := assertstate.DB(state) | ||
| state.Unlock() | ||
|
|
||
| assertions, err := db.FindMany(assertType, headers) | ||
| if asserts.IsNotFound(err) { | ||
| return AssertResponse(nil, true) | ||
| } else if err != nil { | ||
| return InternalError("searching assertions failed: %v", err) | ||
| } | ||
| return AssertResponse(assertions, true) | ||
| } |
Oops, something went wrong.