Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'create_doc' index privilege #45806

Merged
merged 21 commits into from
Oct 7, 2019
+128 −7
Merged

Add 'create_doc' index privilege #45806

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e2a0a5b
Append only index privilege
Aug 21, 2019
6066680
precommit errors
Aug 21, 2019
460deae
fix test
Aug 21, 2019
8d5fceb
fix test
Aug 22, 2019
9b3987d
follow the conventions naming an action
Aug 22, 2019
0d32057
fix test
Aug 22, 2019
20707d3
fix test
Aug 22, 2019
99c2492
check the auto generated timestamp against the constant IndexRequest.…
Aug 22, 2019
e2ddaad
use constants
Aug 26, 2019
d644dc1
Merge branch 'master' into append-only-indices-privilege
Sep 9, 2019
7cab8e9
split into individual test cases
Sep 9, 2019
f4dd373
Merge branch 'master' into append-only-indices-privilege
Sep 23, 2019
dca6df0
'create_docs' as index privilege name instead of append-only
Sep 23, 2019
931823d
address review comment - use create_doc
Sep 25, 2019
9829bd4
address review comment
Sep 26, 2019
b080a38
Merge branch 'master' into append-only-indices-privilege
Oct 4, 2019
3927063
remove the logic to determine effective op_type
Oct 4, 2019
9e79797
remove unused import
Oct 4, 2019
635ccaa
add test case for bulk with create op_type
Oct 5, 2019
e55225a
address review comments
Oct 7, 2019
f15e735
Merge branch 'master' into append-only-indices-privilege
Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address review comments
Yogesh Gaikwad committed Oct 7, 2019
commit e55225aa161c18943457a05425f3fbbce2ad3c5a
6 changes: 3 additions & 3 deletions ...e/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/IndexPrivilege.java
View file
Original file line number Diff line number Diff line change
@@ -48,8 +48,8 @@ public final class IndexPrivilege extends Privilege {
ClusterSearchShardsAction.NAME);
private static final Automaton CREATE_AUTOMATON = patterns("indices:data/write/index*", "indices:data/write/bulk*",
PutMappingAction.NAME);
private static final Automaton CREATE_DOC_AUTOMATON = Automatons.minusAndMinimize(CREATE_AUTOMATON,
patterns("indices:data/write/index:op_type/index"));
private static final Automaton CREATE_DOC_AUTOMATON = patterns("indices:data/write/index", "indices:data/write/index[*",
"indices:data/write/index:op_type/create", "indices:data/write/bulk*", PutMappingAction.NAME);
private static final Automaton INDEX_AUTOMATON =
patterns("indices:data/write/index*", "indices:data/write/bulk*", "indices:data/write/update*", PutMappingAction.NAME);
private static final Automaton DELETE_AUTOMATON = patterns("indices:data/write/delete*", "indices:data/write/bulk*");
@@ -75,7 +75,7 @@ public final class IndexPrivilege extends Privilege {
public static final IndexPrivilege INDEX = new IndexPrivilege("index", INDEX_AUTOMATON);
public static final IndexPrivilege DELETE = new IndexPrivilege("delete", DELETE_AUTOMATON);
public static final IndexPrivilege WRITE = new IndexPrivilege("write", WRITE_AUTOMATON);
public static final IndexPrivilege CREATE_DOC = new IndexPrivilege("create_doc", CREATE_DOC_AUTOMATON);
public static final IndexPrivilege CREATE_DOC = new IndexPrivilege("create_doc", CREATE_DOC_AUTOMATON);
public static final IndexPrivilege MONITOR = new IndexPrivilege("monitor", MONITOR_AUTOMATON);
public static final IndexPrivilege MANAGE = new IndexPrivilege("manage", MANAGE_AUTOMATON);
public static final IndexPrivilege DELETE_INDEX = new IndexPrivilege("delete_index", DELETE_INDEX_AUTOMATON);