Xiang Li
6958334db2
Merge pull request #5662 from xiang90/auth_delete
...
*: support deleteRange perm checking
2016-06-13 20:13:43 -07:00
Anthony Romano
c97107cf81
Merge pull request #5660 from heyitsanthony/fix-watch-test
...
e2e: don't Put() after watchTest finishes
2016-06-13 19:39:30 -07:00
Xiang Li
a571bd0271
Merge pull request #5661 from xiang90/fix_subset
...
auth: fix remove subset when there are equal ranges
2016-06-13 19:03:10 -07:00
Xiang Li
c75fa6fdc9
*: support deleteRange perm checking
2016-06-13 17:49:13 -07:00
Xiang Li
e67613830e
auth: fix remove subset when there are equal ranges
2016-06-13 17:13:55 -07:00
Anthony Romano
d78ef8bc72
e2e: don't Put() after watchTest finishes
...
Fixes #5598
2016-06-13 16:55:02 -07:00
Xiang Li
a26ebfb675
Merge pull request #5654 from xiang90/auth_key
...
auth: add key support in merge func
2016-06-13 16:53:36 -07:00
Xiang Li
38546a9d24
auth: use bytes equal when possible
2016-06-13 16:37:21 -07:00
Xiang Li
390c89b7f9
auth: remove the special checking case for key auth
2016-06-13 16:37:20 -07:00
Xiang Li
9be65414eb
auth: add key support in merge func
2016-06-13 16:37:20 -07:00
Gyu-Ho Lee
2a018240e7
Merge pull request #5657 from gyuho/cleanup
...
etcd-tester: cleanup in compact error, log level
2016-06-13 15:15:52 -07:00
Gyu-Ho Lee
84953365a2
etcd-tester: cleanup in compact error, log level
2016-06-13 14:54:53 -07:00
Gyu-Ho Lee
18851e70b6
Merge pull request #5656 from gyuho/auth_bytes
...
make auth key, rangeEnd typed like mvcc ([]byte)
2016-06-13 14:41:19 -07:00
Gyu-Ho Lee
5d6af0b51f
etcdserver: key, rangeEnd in []byte for auth
2016-06-13 14:21:25 -07:00
Gyu-Ho Lee
e9d2eb2b54
auth: key, range in []byte type
...
Fix https://github.com/coreos/etcd/issues/5655 .
2016-06-13 14:21:22 -07:00
Gyu-Ho Lee
70a2add2b0
Merge pull request #5650 from gyuho/wal_update
...
wal: use bytes.Equal, other minor updates
2016-06-13 09:05:53 -07:00
Gyu-Ho Lee
b4aa4607cb
wal: use bytes.Equal, other minor updates
...
- Replace reflect.Equal with bytes.Equal where possible
- Remove some TODOs
- Some minor simplifications
2016-06-13 01:33:53 -07:00
Xiang Li
f25b3dbfc8
Merge pull request #5640 from xiang90/permcheck
...
auth: clean permission checking
2016-06-12 18:26:21 -07:00
Gyu-Ho Lee
667093bbd1
Merge pull request #5645 from gyuho/wal_simple
...
wal: simplify boolean return
2016-06-11 11:10:59 -07:00
Gyu-Ho Lee
3243795522
wal: simplify boolean return
2016-06-11 10:36:52 -07:00
Xiang Li
4aaf7f94cf
Merge pull request #5643 from hongchaodeng/doc-fix
...
v3 docs: ErrCompaction -> ErrCompacted
2016-06-11 01:40:58 -07:00
Hongchao Deng
c11418b56c
docs: v3 api, ErrCompaction -> ErrCompacted
2016-06-10 21:53:06 -07:00
Gyu-Ho Lee
bdb5a321d1
Merge pull request #5642 from gyuho/client
...
vendor: update grpc dependency
2016-06-10 21:09:52 -07:00
Gyu-Ho Lee
5225a4e4bc
clientv3: fix client for grpc change
...
Fix https://github.com/coreos/etcd/issues/5638 .
2016-06-10 20:40:46 -07:00
Gyu-Ho Lee
b2a531d5a3
vendor: update grpc dependency
...
For 59486d9c17
2016-06-10 20:40:06 -07:00
Xiang Li
1bbe09eb3c
auth: clean permission checking
2016-06-10 19:23:20 -07:00
Gyu-Ho Lee
cff5851956
Merge pull request #5639 from mitake/email
...
MAINTAINERS: updating email address of Hitoshi Mitake
2016-06-10 18:40:41 -07:00
Hitoshi Mitake
6b80f0ad7e
MAINTAINERS: updating email address of Hitoshi Mitake
...
I'm mainly using the updated email address for working.
2016-06-10 18:12:39 -07:00
Xiang Li
ae366ba4f1
Merge pull request #5637 from xiang90/auth_clean
...
auth: cleanup get perm func
2016-06-10 18:12:07 -07:00
Xiang Li
f99ff5d513
auth: cleanup get perm func
2016-06-10 16:36:51 -07:00
Xiang Li
3eab6bef6a
Merge pull request #5635 from xiang90/cl
...
auth: clean up range_perm_cache.go
2016-06-10 16:08:54 -07:00
Xiang Li
c802c23e6d
Merge pull request #5636 from xiang90/mt
...
MAINTAINERS: add Hitoshi as a maintainer of auth pkg
2016-06-10 16:07:04 -07:00
Xiang Li
43db5515e7
MAINTAINERS: add Hitoshi as a maintainer of auth pkg
2016-06-10 15:55:57 -07:00
Gyu-Ho Lee
c6fae5d566
Merge pull request #5631 from raoofm/patch-8
...
Doc: Fault tolerance table
2016-06-10 15:49:36 -07:00
Gyu-Ho Lee
175c67a552
Merge pull request #5634 from gyuho/wal
...
wal: PrivateFileMode/DirMode as in pkg/fileutil
2016-06-10 15:41:43 -07:00
Xiang Li
65ff76882b
Merge pull request #5624 from xiang90/warn_apply
...
etcdserver: warn heavy apply
2016-06-10 15:28:27 -07:00
Gyu-Ho Lee
47d5257622
pkg/fileutil: expose PrivateFileMode/DirMode
2016-06-10 15:22:14 -07:00
Xiang Li
77efe4cda9
auth: clean up range_perm_cache.go
2016-06-10 15:21:04 -07:00
Gyu-Ho Lee
4570eddc2c
wal: PrivateFileMode/DirMode as in pkg/fileutil
...
To make it consistent with pkg/fileutil
2016-06-10 15:20:57 -07:00
Xiang Li
3210bb8181
Merge pull request #5632 from xiang90/auth_store_cleanup
...
auth: cleanup store.go
2016-06-10 14:49:56 -07:00
Xiang Li
a92ea417b4
Merge pull request #5534 from gyuho/readme
...
README: minor fix in README
2016-06-10 14:46:15 -07:00
Xiang Li
64eccd519d
etcdserver: warn heavy apply
2016-06-10 14:43:34 -07:00
Hitoshi Mitake
bb6102c00c
Merge pull request #5630 from xiang90/del_user
...
auth: add del functions for user/role
2016-06-10 14:28:36 -07:00
Xiang Li
f8c1a50195
auth: cleanup store.go
2016-06-10 14:19:29 -07:00
Hitoshi Mitake
2781553a9e
Merge pull request #5615 from mitake/auth-v3-consistent-token
...
auth, etcdserver: make auth tokens consistent for all nodes
2016-06-10 14:19:21 -07:00
Raoof Mohammed
37ac90c419
Doc: Fault tolerance table
2016-06-10 17:12:36 -04:00
Xiang Li
8776962008
auth: add del functions for user/role
2016-06-10 14:11:00 -07:00
Hitoshi Mitake
ead5096fa9
auth, etcdserver: make auth tokens consistent for all nodes
...
Currently auth tokens are generated in the replicated state machine
layer randomly. It means one auth token generated in node A cannot be
used for node B. It is problematic for load balancing and fail
over. This commit moves the token generation logic from the state
machine to API layer (before raft) and let all nodes share a single
token.
Log index of Raft is also added to a token for ensuring uniqueness of
the token and detecting activation of the token in the cluster (some
nodes can receive the token before generating and installing the token
in its state machine).
This commit also lets authStore have simple token related things. It
is required because of unit test. The test requires cleaning of the
state of the simple token things after one test (succeeding test can
create duplicated token and it causes panic).
2016-06-10 13:55:37 -07:00
Xiang Li
65abcc1a59
Merge pull request #5629 from xiang90/put_role
...
auth: cleanup
2016-06-10 13:53:34 -07:00
Xiang Li
cf99d596f5
auth: cleanup get user and get role usage
2016-06-10 13:34:40 -07:00