Commit Graph

46 Commits

Author SHA1 Message Date
James Phillips e9670761f9
Cleans up some drift between the OSS and Enterprise trees. 2017-10-11 15:53:07 -07:00
Preetha Appan 3c81e2db7c Only allow 'list' policies within 'key' policy definitions. Consolidated two similar tests into one and fixed alignment. 2017-10-03 15:15:56 -05:00
Preetha Appan d5acfc3982 Introduces new 'list' permission that applies to KV store recursive reads, and enforced only when opted in. 2017-10-02 17:10:21 -05:00
Preetha Appan 8394ad08db Introduce Code Policy validation via sentinel, with a noop implementation 2017-09-25 13:44:55 -05:00
Frank Schröder 44e6b8122d acl: consolidate error handling (#3401)
The error handling of the ACL code relies on the presence of certain
magic error messages. Since the error values are sent via RPC between
older and newer consul agents we cannot just replace the magic values
with typed errors and switch to type checks since this would break
compatibility with older clients.

Therefore, this patch moves all magic ACL error messages into the acl
package and provides default error values and helper functions which
determine the type of error.
2017-08-23 16:52:48 +02:00
游远 25860a0718 fix UnitTest in acl 2017-08-09 14:21:21 +08:00
James Phillips f144ce818e
Adds support to the ACL package for agent policies. 2016-12-14 07:07:41 -08:00
James Phillips bdafd33ce8
Adds support to ACL package for session policies. 2016-12-12 20:20:28 -08:00
James Phillips e86bfd9953
Adds support to ACL package for node policies. 2016-12-06 20:05:15 -08:00
James Phillips 1393403bd2
Sorts all the ACl policy handlers for easier navigation (no functional changes). 2016-12-06 11:06:15 -08:00
James Phillips bc29610124 Adds support for snapshots and restores. (#2396)
* Updates Raft library to get new snapshot/restore API.

* Basic backup and restore working, but need some cleanup.

* Breaks out a snapshot module and adds a SHA256 integrity check.

* Adds snapshot ACL and fills in some missing comments.

* Require a consistent read for snapshots.

* Make sure snapshot works if ACLs aren't enabled.

* Adds a bit of package documentation.

* Returns an empty response from restore to avoid EOF errors.

* Adds API client support for snapshots.

* Makes internal file names match on-disk file snapshots.

* Adds DC and token coverage for snapshot API test.

* Adds missing documentation.

* Adds a unit test for the snapshot client endpoint.

* Moves the connection pool out of the client for easier testing.

* Fixes an incidental issue in the prepared query unit test.

I realized I had two servers in bootstrap mode so this wasn't a good setup.

* Adds a half close to the TCP stream and fixes panic on error.

* Adds client and endpoint tests for snapshots.

* Moves the pool back into the snapshot RPC client.

* Adds a TLS test and fixes half-closes for TLS connections.

* Tweaks some comments.

* Adds a low-level snapshot test.

This is independent of Consul so we can pull this out into a library
later if we want to.

* Cleans up snapshot and archive and completes archive tests.

* Sends a clear error for snapshot operations in dev mode.

Snapshots require the Raft snapshots to be readable, which isn't supported
in dev mode. Send a clear error instead of a deep-down Raft one.

* Adds docs for the snapshot endpoint.

* Adds a stale mode and index feedback for snapshot saves.

This gives folks a way to extract data even if the cluster has no
leader.

* Changes the internal format of a snapshot from zip to tgz.

* Pulls in Raft fix to cancel inflight before a restore.

* Pulls in new Raft restore interface.

* Adds metadata to snapshot saves and a verify function.

* Adds basic save and restore snapshot CLI commands.

* Gets rid of tarball extensions and adds restore message.

* Fixes an incidental bad link in the KV docs.

* Adds documentation for the snapshot CLI commands.

* Scuttle any request body when a snapshot is saved.

* Fixes archive unit test error message check.

* Allows for nil output writers in snapshot RPC handlers.

* Renames hash list Decode to DecodeAndVerify.

* Closes the client connection for snapshot ops.

* Lowers timeout for restore ops.

* Updates Raft vendor to get new Restore signature and integrates with Consul.

* Bounces the leader's internal state when we do a restore.
2016-10-25 19:20:24 -07:00
James Phillips 1b7a16b7d3
Adds new consul operator endpoint, CLI, and ACL and some basic Raft commands. 2016-08-30 00:02:50 -07:00
James Phillips 0fa059ec49
Switches all ACL caches to 2Q. 2016-08-09 11:00:22 -07:00
James Phillips 796933b45b
Activates fallback to replicated ACLs. 2016-08-03 21:24:09 -07:00
James Phillips 2f7eac8b86 Renames "prepared_query" ACL policy to "query". 2016-02-24 17:02:06 -08:00
James Phillips 54f0b7bbb6 Completes switch of prepared_query ACLs to govern query names. 2016-02-24 01:26:16 -08:00
James Phillips 633c231d67 Creates new "prepared-query" ACL type and new token capture behavior.
Prior to this change, prepared queries had the following behavior for
ACLs, which will need to change to support templates:

1. A management token, or a token with read access to the service being
   queried needed to be provided in order to create a prepared query.

2. The token used to create the prepared query was stored with the query
   in the state store and used to execute the query.

3. A management token, or the token used to create the query needed to be
   supplied to perform and CRUD operations on an existing prepared query.

This was pretty subtle and complicated behavior, and won't work for
templates since the service name is computed at execution time. To solve
this, we introduce a new "prepared-query" ACL type, where the prefix
applies to the query name for static prepared query types and to the
prefix for template prepared query types.

With this change, the new behavior is:

1. A management token, or a token with "prepared-query" write access to
   the query name or (soon) the given template prefix is required to do
   any CRUD operations on a prepared query, or to list prepared queries
   (the list is filtered by this ACL).

2. You will no longer need a management token to list prepared queries,
   but you will only be able to see prepared queries that you have access
   to (you get an empty list instead of permission denied).

3. When listing or getting a query, because it was easy to capture
   management tokens given the past behavior, this will always blank out
   the "Token" field (replacing the contents as <hidden>) for all tokens
   unless a management token is supplied. Going forward, we should
   discourage people from binding tokens for execution unless strictly
   necessary.

4. No token will be captured by default when a prepared query is created.
   If the user wishes to supply an execution token then can pass it in via
   the "Token" field in the prepared query definition. Otherwise, this
   field will default to empty.

5. At execution time, we will use the captured token if it exists with the
   prepared query definition, otherwise we will use the token that's passed
   in with the request, just like we do for other RPCs (or you can use the
   agent's configured token for DNS).

6. Prepared queries with no name (accessible only by ID) will not require
   ACLs to create or modify (execution time will depend on the service ACL
   configuration). Our argument here is that these are designed to be
   ephemeral and the IDs are as good as an ACL. Management tokens will be
   able to list all of these.

These changes enable templates, but also enable delegation of authority to
manage the prepared query namespace.
2016-02-23 17:12:43 -08:00
James Phillips 3bc9764da8 Adds a new management ACL for prepared queries. 2015-11-15 17:06:00 -08:00
Dale Wijnand c5168e1263 Fix a bunch of typos. 2015-09-15 13:22:08 +01:00
Ryan Uber 4a7fdc439f acl: adding negative tests for bad policy 2015-07-07 14:46:41 -06:00
Ryan Uber 4ac7596b14 acl: more keyring tests 2015-07-07 11:21:27 -06:00
Ryan Uber 2dab8a5ddd acl: allow omitting keyring policy, add tests 2015-07-07 11:07:37 -06:00
Ryan Uber 177b5b434e acl: keyring policy uses a flat string 2015-07-07 10:45:38 -06:00
Ryan Uber 4ef6545583 acl: initial pass at keyring ACLs 2015-07-06 18:28:09 -06:00
Ryan Uber bfaf11d3d6 acl: fix spelling in tests 2015-06-19 10:20:38 -07:00
Ryan Uber 3e5908076c acl: support for user events 2015-06-18 18:13:28 -07:00
Maciej Bryński 79bae63dfe Consul prefix services ACLs 2015-05-05 08:25:19 +02:00
Veres Lajos 850d5bdc32 typofixes - https://github.com/vlajos/misspell_fixer 2014-12-04 23:25:06 +00:00
Armon Dadgar 7b8faf4cb3 acl: Expose service policy checks 2014-11-30 20:33:46 -07:00
Armon Dadgar b9810f774c acl: Support for service policies 2014-11-30 20:18:16 -07:00
Armon Dadgar 350a94d3f2 acl: Test parsing JSON 2014-08-18 15:46:59 -07:00
Armon Dadgar 07aa353f19 acl: Updating for HCL changes 2014-08-18 15:46:58 -07:00
Armon Dadgar 88ee7b45cb acl: Avoid shared cache with different parents 2014-08-18 15:46:24 -07:00
Armon Dadgar f3336fc732 acl: Support checking write permissions on a prefix 2014-08-18 15:46:24 -07:00
Armon Dadgar 9c2b7b9e10 acl: Avoid infinite recursion... 2014-08-18 15:46:23 -07:00
Armon Dadgar 02e71c70c5 acl: Support ACL checks, adding new root policy 2014-08-18 15:46:23 -07:00
Armon Dadgar 12eae669bb acl: Return the parent with GetACLPolicy 2014-08-18 15:46:23 -07:00
Armon Dadgar 32e1f8e259 acl: Simplify parent ACL, adding root policies 2014-08-18 15:46:23 -07:00
Armon Dadgar 19b2868fda acl: Use only a single Radix tree per ACL 2014-08-18 15:46:22 -07:00
Armon Dadgar 044356bdaa acl: Adding cache purging 2014-08-18 15:46:22 -07:00
Armon Dadgar bee6e4e559 acl: Adding additional tier of caching 2014-08-18 15:46:22 -07:00
Armon Dadgar 4caff50607 acl: Associate policy ID 2014-08-18 15:46:22 -07:00
Armon Dadgar ea1ee5c13e acl: Change types 2014-08-18 15:46:22 -07:00
Armon Dadgar dcd4508ca9 acl: Adding cached policy fetch via ACL 2014-08-18 15:46:21 -07:00
Armon Dadgar 1c54400d08 acl: Adding caching mechanism 2014-08-18 15:46:21 -07:00
Armon Dadgar 05a73045d0 acl: First pass 2014-08-18 15:46:21 -07:00