risdenk commented on a change in pull request #717:
URL: https://github.com/apache/solr/pull/717#discussion_r817882367
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -333,65 +404,75 @@ public void testIndirectUpdateStream() throws Exception {
}
{ // WRITE_X user should be able to update X via a (search) stream from Y
(routed via X)...
- final String expr
- = "update("+COLLECTION_X+", batchSize=5, " // note
batch size
- + " search("+COLLECTION_Y+", "
- + " q=\"foo_i:[30 TO *]\", " // 13
matches = 3 batches
- + " rows=100, "
- + " fl=\"id,foo_i\", "
- + " sort=\"foo_i desc\")) "
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_X, // NOTE: X route
- params("qt", "/stream",
- "expr", expr));
+ final String expr =
+ "update("
+ + COLLECTION_X
+ + ", batchSize=5, " // note batch size
+ + " search("
+ + COLLECTION_Y
+ + ", "
+ + " q=\"foo_i:[30 TO *]\", " //
13 matches = 3
+ // batches
+ + " rows=100, "
+ + " fl=\"id,foo_i\", "
+ + " sort=\"foo_i desc\")) ";
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -407,49 +488,55 @@ public void
testExecutorUpdateStreamInsufficientCredentials() throws Exception {
// ... regardless of how the request is routed...
for (String path : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
final String trace = user + ":" + path;
- final String expr
- = "executor(threads=1,
"
- + " tuple(expr_s=\"update("+COLLECTION_X+", batchSize=5,
"
- + "
tuple(id='"+(++id)+"',foo_s='"+trace+"')) "
- + " \"))
"
- ;
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + path,
- params("qt", "/stream",
- "_trace",
"executor_via_" + trace,
- "expr", expr));
+ final String expr =
+ "executor(threads=1,
"
+ + " tuple(expr_s=\"update("
+ + COLLECTION_X
+ + ", batchSize=5, "
+ + " tuple(id='"
+ + (++id)
+ + "',foo_s='"
+ + trace
+ + "')) "
+ + " \"))
";
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -333,65 +404,75 @@ public void testIndirectUpdateStream() throws Exception {
}
{ // WRITE_X user should be able to update X via a (search) stream from Y
(routed via X)...
- final String expr
- = "update("+COLLECTION_X+", batchSize=5, " // note
batch size
- + " search("+COLLECTION_Y+", "
- + " q=\"foo_i:[30 TO *]\", " // 13
matches = 3 batches
- + " rows=100, "
- + " fl=\"id,foo_i\", "
- + " sort=\"foo_i desc\")) "
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_X, // NOTE: X route
- params("qt", "/stream",
- "expr", expr));
+ final String expr =
+ "update("
+ + COLLECTION_X
+ + ", batchSize=5, " // note batch size
+ + " search("
+ + COLLECTION_Y
+ + ", "
+ + " q=\"foo_i:[30 TO *]\", " //
13 matches = 3
+ // batches
+ + " rows=100, "
+ + " fl=\"id,foo_i\", "
+ + " sort=\"foo_i desc\")) ";
+
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X, // NOTE: X route
+ params("qt", "/stream", "expr", expr));
solrStream.setCredentials(WRITE_X_USER, WRITE_X_USER);
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(3, tuples.size());
-
- assertEquals( 5L, tuples.get(0).get("batchIndexed"));
- assertEquals( 5L, tuples.get(0).get("totalIndexed"));
-
- assertEquals( 5L, tuples.get(1).get("batchIndexed"));
+
+ assertEquals(5L, tuples.get(0).get("batchIndexed"));
+ assertEquals(5L, tuples.get(0).get("totalIndexed"));
+
+ assertEquals(5L, tuples.get(1).get("batchIndexed"));
assertEquals(10L, tuples.get(1).get("totalIndexed"));
-
- assertEquals( 3L, tuples.get(2).get("batchIndexed"));
+
+ assertEquals(3L, tuples.get(2).get("batchIndexed"));
assertEquals(13L, tuples.get(2).get("totalIndexed"));
}
assertEquals(1L + 10L + 13L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
-
}
-
+
public void testIndirectUpdateStreamInsufficientCredentials() throws
Exception {
-
+
// regardless of how it's routed, WRITE_Y should NOT have authz to stream
updates to X...
for (String path : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + path,
- params("qt", "/stream",
"expr",
-
"update("+COLLECTION_X+",batchSize=1," +
-
"tuple(id=42,a_i=1,b_i=5))"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + path,
+ params(
+ "qt",
+ "/stream",
+ "expr",
+ "update(" + COLLECTION_X + ",batchSize=1," +
"tuple(id=42,a_i=1,b_i=5))"));
solrStream.setCredentials(WRITE_Y_USER, WRITE_Y_USER);
-
+
// NOTE: Can't make any assertions about Exception: SOLR-14226
- expectThrows(Exception.class, () -> {
- final List<Tuple> ignored = getTuples(solrStream);
- });
+ expectThrows(
+ Exception.class,
+ () -> {
+ final List<Tuple> ignored = getTuples(solrStream);
+ });
}
assertEquals(0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
}
public void testExecutorUpdateStream() throws Exception {
- final String expr
- = "executor(threads=1, "
- + " tuple(expr_s=\"update("+COLLECTION_X+", batchSize=5, "
- + " tuple(id=42,a_i=1,b_i=5)) "
- + " \")) "
- ;
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
- "expr", expr));
+ final String expr =
+ "executor(threads=1, "
+ + " tuple(expr_s=\"update("
+ + COLLECTION_X
+ + ", batchSize=5, "
+ + " tuple(id=42,a_i=1,b_i=5)) "
+ + " \"))
";
+ final SolrStream solrStream =
+ new SolrStream(solrUrl + "/" + COLLECTION_X, params("qt", "/stream",
"expr", expr));
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -407,49 +488,55 @@ public void
testExecutorUpdateStreamInsufficientCredentials() throws Exception {
// ... regardless of how the request is routed...
for (String path : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
final String trace = user + ":" + path;
- final String expr
- = "executor(threads=1,
"
- + " tuple(expr_s=\"update("+COLLECTION_X+", batchSize=5,
"
- + "
tuple(id='"+(++id)+"',foo_s='"+trace+"')) "
- + " \"))
"
- ;
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + path,
- params("qt", "/stream",
- "_trace",
"executor_via_" + trace,
- "expr", expr));
+ final String expr =
+ "executor(threads=1,
"
+ + " tuple(expr_s=\"update("
+ + COLLECTION_X
+ + ", batchSize=5, "
+ + " tuple(id='"
+ + (++id)
+ + "',foo_s='"
+ + trace
+ + "')) "
+ + " \"))
";
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + path,
+ params("qt", "/stream", "_trace", "executor_via_" + trace,
"expr", expr));
solrStream.setCredentials(user, user);
// NOTE: Becaue of the backgroun threads, no failures will to be
returned to client...
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(0, tuples.size());
-
- // we have to assert that the updates failed solely based on the side
effects...
- assertEquals("doc count after execute update via " + trace,
- 0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
+ // we have to assert that the updates failed solely based on the side
effects...
+ assertEquals(
+ "doc count after execute update via " + trace,
+ 0L,
+ commitAndCountDocsInCollection(COLLECTION_X, WRITE_X_USER));
}
}
// sanity check
- assertEquals("final doc count",
- 0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
+ assertEquals("final doc count", 0L,
commitAndCountDocsInCollection(COLLECTION_X, WRITE_X_USER));
}
public void testDaemonUpdateStream() throws Exception {
final String daemonUrl = getRandomCoreUrl(COLLECTION_X);
log.info("Using Daemon @ {}", daemonUrl);
-
+
{
final String expr
- // NOTE: inspite of what is implied by 'terminate=true', this daemon
will
- // NEVER terminate on it's own as long as the updates are successful
- // (aparently that requires usage of anest topic() stream to set a
"sleepMillis"?!?!?!)
- = "daemon(id=daemonId,runInterval=1000,terminate=true, "
- + " update("+COLLECTION_X+",tuple(id=42,a_i=1,b_i=5))) "
- ;
- final SolrStream solrStream = new SolrStream(daemonUrl,
- params("qt", "/stream",
- "expr", expr));
+ // NOTE: inspite of what is implied by 'terminate=true', this daemon
will
+ // NEVER terminate on it's own as long as the updates are successful
+ // (aparently that requires usage of anest topic() stream to set a
"sleepMillis"?!?!?!)
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -513,178 +609,223 @@ public void
testDaemonUpdateStreamInsufficientCredentials() throws Exception {
// We have to poll the daemon 'list' to know once it's run /
terminated...
Object state = null;
final TimeOut timeout = new TimeOut(60, TimeUnit.SECONDS,
TimeSource.NANO_TIME);
- while ( ! timeout.hasTimedOut() ) {
- final SolrStream daemonCheck = new SolrStream(daemonUrl,
- params("qt", "/stream",
- "_trace",
"check_" + daemonId,
- "action",
"list"));
+ while (!timeout.hasTimedOut()) {
+ final SolrStream daemonCheck =
+ new SolrStream(
+ daemonUrl,
+ params(
+ "qt", "/stream",
+ "_trace", "check_" + daemonId,
+ "action", "list"));
daemonCheck.setCredentials(user, user);
final List<Tuple> tuples = getTuples(daemonCheck);
assertEquals(1, tuples.size()); // our daemon;
if (log.isInfoEnabled()) {
log.info("Current daemon status: {}", tuples.get(0).getFields());
}
- assertEquals(daemonId + " should have never had a successful
iteration",
- Long.valueOf(0L), tuples.get(0).getLong("iterations"));
+ assertEquals(
+ daemonId + " should have never had a successful iteration",
+ Long.valueOf(0L),
+ tuples.get(0).getLong("iterations"));
state = tuples.get(0).get("state");
if ("TERMINATED".equals(state)) {
// once the daemon has failed, break out of TimeOut
break;
}
Thread.sleep(Math.max(1, Math.min(5000,
timeout.timeLeft(TimeUnit.MILLISECONDS))));
}
- assertEquals("Timed out w/o ever getting TERMINATED state from " +
daemonId,
- "TERMINATED", state);
+ assertEquals(
+ "Timed out w/o ever getting TERMINATED state from " + daemonId,
"TERMINATED", state);
} finally {
// kill the damon...
- final SolrStream daemonKiller = new SolrStream(daemonUrl,
- params("qt", "/stream",
- "_trace",
"kill_" + daemonId,
- "action", "kill",
- "id", daemonId));
+ final SolrStream daemonKiller =
+ new SolrStream(
+ daemonUrl,
+ params(
+ "qt",
+ "/stream",
+ "_trace",
+ "kill_" + daemonId,
+ "action",
+ "kill",
+ "id",
+ daemonId));
daemonKiller.setCredentials(user, user);
final List<Tuple> tuples = getTuples(daemonKiller);
assertEquals(1, tuples.size()); // daemon death status
}
-
- assertEquals("doc count after daemon update for " + user,
- 0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
+
+ assertEquals(
+ "doc count after daemon update for " + user,
+ 0L,
+ commitAndCountDocsInCollection(COLLECTION_X, WRITE_X_USER));
}
-
+
// sanity check
- assertEquals("final doc count",
- 0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
-
+ assertEquals("final doc count", 0L,
commitAndCountDocsInCollection(COLLECTION_X, WRITE_X_USER));
}
public void testSimpleDeleteStream() throws Exception {
- assertEquals(0,
- (setBasicAuthCredentials(new UpdateRequest(), WRITE_X_USER)
- .add(sdoc("id", "42"))
- .commit(cluster.getSolrClient(), COLLECTION_X)).getStatus());
+ assertEquals(
+ 0,
+ (setBasicAuthCredentials(new UpdateRequest(), WRITE_X_USER)
+ .add(sdoc("id", "42"))
+ .commit(cluster.getSolrClient(), COLLECTION_X))
+ .getStatus());
assertEquals(1L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
"expr",
-
"delete("+COLLECTION_X+",batchSize=1," +
- "tuple(id=42))"));
+
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt",
+ "/stream",
+ "expr",
+ "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
solrStream.setCredentials(WRITE_X_USER, WRITE_X_USER);
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
assertEquals(1L, tuples.get(0).get("totalIndexed"));
-
- assertEquals(0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
+ assertEquals(0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
}
/** A simple "Delete by Query" example */
public void testSimpleDeleteStreamByQuery() throws Exception {
{ // Put some "real" docs directly to both X...
final UpdateRequest update = setBasicAuthCredentials(new
UpdateRequest(), WRITE_X_USER);
for (int i = 1; i <= 42; i++) {
- update.add(sdoc("id",i+"x","foo_i",""+i));
+ update.add(sdoc("id", i + "x", "foo_i", "" + i));
}
- assertEquals("initial docs in X",
- 0, update.commit(cluster.getSolrClient(),
COLLECTION_X).getStatus());
+ assertEquals(
+ "initial docs in X", 0, update.commit(cluster.getSolrClient(),
COLLECTION_X).getStatus());
}
-
+
assertEquals(42L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
-
+
{ // WRITE_X user should be able to delete X via a query from X
- final String expr
- = "delete("+COLLECTION_X+", batchSize=5, " // note
batch size
- + " search("+COLLECTION_X+", "
- + " q=\"foo_i:[* TO 10]\", " // 10
matches = 2 batches
- + " rows=100, "
- + " fl=\"id,foo_i,_version_\", " // foo_i
should be ignored...
- + " sort=\"foo_i desc\")) " //
version constraint should be ok
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_X,
- params("qt", "/stream",
- "expr", expr));
+ final String expr =
+ "delete("
+ + COLLECTION_X
+ + ", batchSize=5, " // note batch size
+ + " search("
+ + COLLECTION_X
+ + ", "
+ + " q=\"foo_i:[* TO 10]\", " //
10 matches = 2
+ // batches
+ + " rows=100, "
+ + " fl=\"id,foo_i,_version_\", " //
foo_i should be
+ // ignored...
+ + " sort=\"foo_i desc\")) " //
version constraint
+ // should be ok
+ ;
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -693,115 +834,143 @@ public void testIndirectDeleteStream() throws Exception
{
assertEquals(42L - 1L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
assertEquals(42L, commitAndCountDocsInCollection(COLLECTION_Y,
WRITE_Y_USER));
-
- { // WRITE_X user should be able to delete ids from X via a (search)
stream from Y (routed via Y)
- final String expr
- = "delete("+COLLECTION_X+", batchSize=50, " // note
batch size
- + " pruneVersionField=true, " // NOTE:
ignoring Y version to del X
- + " search("+COLLECTION_Y+", "
- + " q=\"foo_i:[* TO 10]\", " // 10
matches = 1 batch
- + " rows=100, "
- + " fl=\"id,foo_i,_version_\", " // foo_i
& version should be ignored
- + " sort=\"foo_i desc\")) "
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_Y, // NOTE: Y route
- params("qt", "/stream",
- "expr", expr));
+
+ { // WRITE_X user should be able to delete ids from X via a (search)
stream from Y (routed via
+ // Y)
+ final String expr =
+ "delete("
+ + COLLECTION_X
+ + ", batchSize=50, " // note batch size
+ + " pruneVersionField=true, " //
NOTE: ignoring Y
+ // version to del X
+ + " search("
+ + COLLECTION_Y
+ + ", "
+ + " q=\"foo_i:[* TO 10]\", " //
10 matches = 1 batch
+ + " rows=100, "
+ + " fl=\"id,foo_i,_version_\", " //
foo_i & version
+ // should be ignored
+ + " sort=\"foo_i desc\")) ";
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -82,249 +81,321 @@
@BeforeClass
public static void setupCluster() throws Exception {
- final List<String> users = Arrays.asList(READ_ONLY_USER, WRITE_X_USER,
WRITE_Y_USER, ADMIN_USER);
+ final List<String> users =
+ Arrays.asList(READ_ONLY_USER, WRITE_X_USER, WRITE_Y_USER, ADMIN_USER);
// For simplicity: every user uses a password the same as their name...
- final Map<String,String> credentials = users.stream()
- .collect(Collectors.toMap(Function.identity(), s ->
getSaltedHashedValue(s)));
-
+ final Map<String, String> credentials =
+ users.stream().collect(Collectors.toMap(Function.identity(), s ->
getSaltedHashedValue(s)));
+
// For simplicity: Every user is their own role...
- final Map<String,String> roles = users.stream()
- .collect(Collectors.toMap(Function.identity(), Function.identity()));
-
- final String SECURITY_JSON = Utils.toJSONString
- (Map.of("authorization",
- Map.of("class",
RuleBasedAuthorizationPlugin.class.getName(),
- "user-role", roles,
- // NOTE: permissions order matters!
- "permissions", Arrays.asList(// any authn
user can 'read' or hit /stream
-
Map.of("name","read",
-
"role","*"),
-
Map.of("name","stream",
-
"collection", "*",
-
"path", "/stream",
-
"role","*"),
- // per
collection write perms
-
Map.of("name","update",
-
"collection", COLLECTION_X,
-
"role", WRITE_X_USER),
-
Map.of("name","update",
-
"collection", COLLECTION_Y,
-
"role", WRITE_Y_USER),
-
Map.of("name","all",
-
"role",ADMIN_USER))),
- "authentication",
- Map.of("class", BasicAuthPlugin.class.getName(),
- "blockUnknown",true,
- "credentials", credentials)));
-
- // we want at most one core per node to force lots of network traffic to
try and tickle distributed bugs
- configureCluster(5)
- .withSecurityJson(SECURITY_JSON)
- .configure();
+ final Map<String, String> roles =
+ users.stream().collect(Collectors.toMap(Function.identity(),
Function.identity()));
+
+ final String SECURITY_JSON =
+ Utils.toJSONString(
+ Map.of(
+ "authorization",
+ Map.of(
+ "class",
+ RuleBasedAuthorizationPlugin.class.getName(),
+ "user-role",
+ roles,
+ // NOTE: permissions order matters!
+ "permissions",
+ Arrays.asList( // any authn user can 'read' or hit /stream
+ Map.of("name", "read", "role", "*"),
+ Map.of("name", "stream", "collection", "*", "path",
"/stream", "role", "*"),
+ // per collection write perms
+ Map.of("name", "update", "collection", COLLECTION_X,
"role", WRITE_X_USER),
+ Map.of("name", "update", "collection", COLLECTION_Y,
"role", WRITE_Y_USER),
+ Map.of("name", "all", "role", ADMIN_USER))),
+ "authentication",
+ Map.of(
+ "class",
+ BasicAuthPlugin.class.getName(),
+ "blockUnknown",
+ true,
+ "credentials",
+ credentials)));
+
+ // we want at most one core per node to force lots of network traffic to
try and tickle
+ // distributed bugs
+ configureCluster(5).withSecurityJson(SECURITY_JSON).configure();
for (String collection : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
CollectionAdminRequest.createCollection(collection, "_default", 2, 2)
.setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
.setBasicAuthCredentials(ADMIN_USER, ADMIN_USER)
- .process(cluster.getSolrClient());
+ .process(cluster.getSolrClient());
}
-
+
for (String collection : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
- cluster.getSolrClient().waitForState(collection, DEFAULT_TIMEOUT,
TimeUnit.SECONDS,
- (n, c) ->
DocCollection.isFullyActive(n, c, 2, 2));
+ cluster
+ .getSolrClient()
+ .waitForState(
+ collection,
+ DEFAULT_TIMEOUT,
+ TimeUnit.SECONDS,
+ (n, c) -> DocCollection.isFullyActive(n, c, 2, 2));
}
solrUrl = cluster.getRandomJetty(random()).getProxyBaseUrl().toString();
-
+
log.info("All stream requests will be sent to random solrUrl: {}",
solrUrl);
}
-
+
@AfterClass
public static void clearVariables() {
solrUrl = null;
}
-
+
@After
public void clearCollections() throws Exception {
log.info("Clearing Collections @After test method...");
- assertEquals(0,
- setBasicAuthCredentials(new UpdateRequest(), WRITE_X_USER)
- .deleteByQuery("*:*")
- .commit(cluster.getSolrClient(), COLLECTION_X).getStatus());
- assertEquals(0,
- setBasicAuthCredentials(new UpdateRequest(), WRITE_Y_USER)
- .deleteByQuery("*:*")
- .commit(cluster.getSolrClient(), COLLECTION_Y).getStatus());
+ assertEquals(
+ 0,
+ setBasicAuthCredentials(new UpdateRequest(), WRITE_X_USER)
+ .deleteByQuery("*:*")
+ .commit(cluster.getSolrClient(), COLLECTION_X)
+ .getStatus());
+ assertEquals(
+ 0,
+ setBasicAuthCredentials(new UpdateRequest(), WRITE_Y_USER)
+ .deleteByQuery("*:*")
+ .commit(cluster.getSolrClient(), COLLECTION_Y)
+ .getStatus());
}
-
- /**
- * Simple sanity checks that authentication is working the way the test
expects
- */
+
+ /** Simple sanity checks that authentication is working the way the test
expects */
public void testSanityCheckAuth() throws Exception {
-
- assertEquals("sanity check of non authenticated query request",
- 401,
- expectThrows(SolrException.class, () -> {
- final long ignored =
- (new QueryRequest(params("q", "*:*",
- "rows", "0",
- "_trace",
"no_auth_sanity_check")))
- .process(cluster.getSolrClient(),
COLLECTION_X).getResults().getNumFound();
- }).code());
-
- assertEquals("sanity check of update to X from write_X user",
- 0,
- (setBasicAuthCredentials(new UpdateRequest(), WRITE_X_USER)
- .add(sdoc("id", "1_from_write_X_user"))
- .commit(cluster.getSolrClient(), COLLECTION_X)).getStatus());
-
- assertEquals("sanity check of update to X from read only user",
- 500, // should be 403, but CloudSolrClient lies on updates
for now: SOLR-14222
- expectThrows(SolrException.class, () -> {
- final int ignored = (setBasicAuthCredentials(new
UpdateRequest(), READ_ONLY_USER)
- .add(sdoc("id",
"2_from_read_only_user"))
- .commit(cluster.getSolrClient(),
COLLECTION_X)).getStatus();
- }).code());
-
- assertEquals("sanity check of update to X from write_Y user",
- 500, // should be 403, but CloudSolrClient lies on updates
for now: SOLR-14222
- expectThrows(SolrException.class, () -> {
- final int ignored = (setBasicAuthCredentials(new
UpdateRequest(), WRITE_Y_USER)
- .add(sdoc("id",
"3_from_write_Y_user"))
- .commit(cluster.getSolrClient(),
COLLECTION_X)).getStatus();
- }).code());
-
- assertEquals("sanity check of update to Y from write_Y user",
- 0,
- (setBasicAuthCredentials(new UpdateRequest(), WRITE_Y_USER)
- .add(sdoc("id", "1_from_write_Y_user"))
- .commit(cluster.getSolrClient(), COLLECTION_Y)).getStatus());
-
+
+ assertEquals(
+ "sanity check of non authenticated query request",
+ 401,
+ expectThrows(
+ SolrException.class,
+ () -> {
+ final long ignored =
+ (new QueryRequest(
+ params(
+ "q", "*:*",
+ "rows", "0",
+ "_trace", "no_auth_sanity_check")))
+ .process(cluster.getSolrClient(), COLLECTION_X)
+ .getResults()
+ .getNumFound();
+ })
+ .code());
+
+ assertEquals(
+ "sanity check of update to X from write_X user",
+ 0,
+ (setBasicAuthCredentials(new UpdateRequest(), WRITE_X_USER)
+ .add(sdoc("id", "1_from_write_X_user"))
+ .commit(cluster.getSolrClient(), COLLECTION_X))
+ .getStatus());
+
+ assertEquals(
+ "sanity check of update to X from read only user",
+ 500, // should be 403, but CloudSolrClient lies on updates for now:
SOLR-14222
+ expectThrows(
+ SolrException.class,
+ () -> {
+ final int ignored =
+ (setBasicAuthCredentials(new UpdateRequest(),
READ_ONLY_USER)
+ .add(sdoc("id", "2_from_read_only_user"))
+ .commit(cluster.getSolrClient(), COLLECTION_X))
+ .getStatus();
+ })
+ .code());
+
+ assertEquals(
+ "sanity check of update to X from write_Y user",
+ 500, // should be 403, but CloudSolrClient lies on updates for now:
SOLR-14222
+ expectThrows(
+ SolrException.class,
+ () -> {
+ final int ignored =
+ (setBasicAuthCredentials(new UpdateRequest(),
WRITE_Y_USER)
+ .add(sdoc("id", "3_from_write_Y_user"))
+ .commit(cluster.getSolrClient(), COLLECTION_X))
+ .getStatus();
+ })
+ .code());
+
+ assertEquals(
+ "sanity check of update to Y from write_Y user",
+ 0,
+ (setBasicAuthCredentials(new UpdateRequest(), WRITE_Y_USER)
+ .add(sdoc("id", "1_from_write_Y_user"))
+ .commit(cluster.getSolrClient(), COLLECTION_Y))
+ .getStatus());
+
for (String user : Arrays.asList(READ_ONLY_USER, WRITE_Y_USER,
WRITE_X_USER)) {
for (String collection : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
- assertEquals("sanity check: query "+collection+" from user: "+user,
- 1, countDocsInCollection(collection, user));
+ assertEquals(
+ "sanity check: query " + collection + " from user: " + user,
+ 1,
+ countDocsInCollection(collection, user));
}
}
}
public void testEchoStream() throws Exception {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
- "expr", "echo(hello
world)"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt", "/stream",
+ "expr", "echo(hello world)"));
solrStream.setCredentials(READ_ONLY_USER, READ_ONLY_USER);
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
assertEquals("hello world", tuples.get(0).get("echo"));
}
-
+
public void testEchoStreamNoCredentials() throws Exception {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
- "expr", "echo(hello
world)"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt", "/stream",
+ "expr", "echo(hello world)"));
// NOTE: no credentials
-
+
// NOTE: Can't make any assertions about Exception: SOLR-14226
- expectThrows(Exception.class, () -> {
- final List<Tuple> ignored = getTuples(solrStream);
- });
+ expectThrows(
+ Exception.class,
+ () -> {
+ final List<Tuple> ignored = getTuples(solrStream);
+ });
}
-
+
public void testEchoStreamInvalidCredentials() throws Exception {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
- "expr", "echo(hello
world)"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt", "/stream",
+ "expr", "echo(hello world)"));
solrStream.setCredentials(READ_ONLY_USER, "BOGUS_PASSWORD");
-
+
// NOTE: Can't make any assertions about Exception: SOLR-14226
- expectThrows(Exception.class, () -> {
- final List<Tuple> ignored = getTuples(solrStream);
- });
+ expectThrows(
+ Exception.class,
+ () -> {
+ final List<Tuple> ignored = getTuples(solrStream);
+ });
}
-
+
public void testSimpleUpdateStream() throws Exception {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
"expr",
-
"update("+COLLECTION_X+",batchSize=1," +
-
"tuple(id=42,a_i=1,b_i=5))"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt",
+ "/stream",
+ "expr",
+ "update(" + COLLECTION_X + ",batchSize=1," +
"tuple(id=42,a_i=1,b_i=5))"));
solrStream.setCredentials(WRITE_X_USER, WRITE_X_USER);
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
assertEquals(1L, tuples.get(0).get("totalIndexed"));
assertEquals(1L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
}
-
+
public void testSimpleUpdateStreamInvalidCredentials() throws Exception {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" + COLLECTION_X,
- params("qt", "/stream",
"expr",
-
"update("+COLLECTION_X+",batchSize=1," +
-
"tuple(id=42,a_i=1,b_i=5))"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt",
+ "/stream",
+ "expr",
+ "update(" + COLLECTION_X + ",batchSize=1," +
"tuple(id=42,a_i=1,b_i=5))"));
// "WRITE" credentials should be required for 'update(...)'
solrStream.setCredentials(WRITE_X_USER, "BOGUS_PASSWORD");
-
+
// NOTE: Can't make any assertions about Exception: SOLR-14226
- expectThrows(Exception.class, () -> {
- final List<Tuple> ignored = getTuples(solrStream);
- });
-
+ expectThrows(
+ Exception.class,
+ () -> {
+ final List<Tuple> ignored = getTuples(solrStream);
+ });
+
assertEquals(0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
}
-
+
public void testSimpleUpdateStreamInsufficientCredentials() throws Exception
{
// both of these users have valid credentials and authz read COLLECTION_X,
but neither has
// authz to write to X...
for (String user : Arrays.asList(READ_ONLY_USER, WRITE_Y_USER)) {
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_X,
- params("qt", "/stream",
"expr",
-
"update("+COLLECTION_X+",batchSize=1," +
-
"tuple(id=42,a_i=1,b_i=5))"));
-
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_X,
+ params(
+ "qt",
+ "/stream",
+ "expr",
+ "update(" + COLLECTION_X + ",batchSize=1," +
"tuple(id=42,a_i=1,b_i=5))"));
+
solrStream.setCredentials(user, user);
-
+
// NOTE: Can't make any assertions about Exception: SOLR-14226
- expectThrows(Exception.class, () -> {
- final List<Tuple> ignored = getTuples(solrStream);
- });
+ expectThrows(
+ Exception.class,
+ () -> {
+ final List<Tuple> ignored = getTuples(solrStream);
+ });
}
-
+
assertEquals(0L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
}
-
+
public void testIndirectUpdateStream() throws Exception {
{ // WRITE_X user should be able to update X via a (dummy) stream from Y...
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_Y,
- params("qt", "/stream",
"expr",
-
"update("+COLLECTION_X+",batchSize=1," +
-
"tuple(id=42,a_i=1,b_i=5))"));
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_Y,
+ params(
+ "qt",
+ "/stream",
+ "expr",
+ "update(" + COLLECTION_X + ",batchSize=1," +
"tuple(id=42,a_i=1,b_i=5))"));
solrStream.setCredentials(WRITE_X_USER, WRITE_X_USER);
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
assertEquals(1L, tuples.get(0).get("totalIndexed"));
}
-
+
{ // Now add some "real" docs directly to Y...
final UpdateRequest update = setBasicAuthCredentials(new
UpdateRequest(), WRITE_Y_USER);
for (int i = 1; i <= 42; i++) {
- update.add(sdoc("id",i+"y","foo_i",""+i));
+ update.add(sdoc("id", i + "y", "foo_i", "" + i));
}
- assertEquals("initial docs in Y",
- 0, update.commit(cluster.getSolrClient(),
COLLECTION_Y).getStatus());
+ assertEquals(
+ "initial docs in Y", 0, update.commit(cluster.getSolrClient(),
COLLECTION_Y).getStatus());
}
{ // WRITE_X user should be able to update X via a (search) stream from Y
(routed via Y)
- final String expr
- = "update("+COLLECTION_X+", batchSize=50, " // note
batch size
- + " search("+COLLECTION_Y+", "
- + " q=\"foo_i:[* TO 10]\", " // 10
matches = 1 batch
- + " rows=100, "
- + " fl=\"id,foo_i,_version_\", " //
pruneVersionField default true
- + " sort=\"foo_i desc\")) "
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_Y, // NOTE: Y route
- params("qt", "/stream",
- "expr", expr));
+ final String expr =
+ "update("
+ + COLLECTION_X
+ + ", batchSize=50, " // note batch size
+ + " search("
+ + COLLECTION_Y
+ + ", "
+ + " q=\"foo_i:[* TO 10]\", " //
10 matches = 1 batch
+ + " rows=100, "
+ + " fl=\"id,foo_i,_version_\", " //
pruneVersionField
+ // default true
+ + " sort=\"foo_i desc\")) ";
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -472,39 +562,45 @@ public void testDaemonUpdateStream() throws Exception {
}
Thread.sleep(Math.max(1, Math.min(5000,
timeout.timeLeft(TimeUnit.MILLISECONDS))));
}
- assertTrue("Didn't see any iterations after waiting an excessive amount
of time: " + iterations,
- 0 < iterations);
+ assertTrue(
+ "Didn't see any iterations after waiting an excessive amount of
time: " + iterations,
+ 0 < iterations);
} finally {
// kill the damon...
- final SolrStream daemonKiller = new SolrStream(daemonUrl,
- params("qt", "/stream",
- "action", "kill",
- "id", "daemonId"));
+ final SolrStream daemonKiller =
+ new SolrStream(
+ daemonUrl,
+ params(
+ "qt", "/stream",
+ "action", "kill",
+ "id", "daemonId"));
daemonKiller.setCredentials(WRITE_X_USER, WRITE_X_USER);
final List<Tuple> tuples = getTuples(daemonKiller);
assertEquals(1, tuples.size()); // daemon death status
}
-
+
assertEquals(1L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
}
-
+
public void testDaemonUpdateStreamInsufficientCredentials() throws Exception
{
final String daemonUrl = getRandomCoreUrl(COLLECTION_X);
log.info("Using Daemon @ {}", daemonUrl);
-
+
// both of these users have valid credentials and authz read COLLECTION_X,
but neither has
// authz to write to X...
for (String user : Arrays.asList(READ_ONLY_USER, WRITE_Y_USER)) {
final String daemonId = "daemon_" + user;
{
- final String expr
- = "daemon(id="+daemonId+",runInterval=1000,terminate=true,
"
- + " update("+COLLECTION_X+",tuple(id=42,a_i=1,b_i=5))) "
- ;
- final SolrStream solrStream = new SolrStream(daemonUrl,
- params("qt", "/stream",
- "_trace", "start_"
+ daemonId,
- "expr", expr));
+ final String expr =
+ "daemon(id="
+ + daemonId
+ + ",runInterval=1000,terminate=true, "
+ + " update("
+ + COLLECTION_X
+ + ",tuple(id=42,a_i=1,b_i=5))) ";
Review comment:
Fix this
##########
File path:
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
##########
@@ -693,115 +834,143 @@ public void testIndirectDeleteStream() throws Exception
{
assertEquals(42L - 1L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
assertEquals(42L, commitAndCountDocsInCollection(COLLECTION_Y,
WRITE_Y_USER));
-
- { // WRITE_X user should be able to delete ids from X via a (search)
stream from Y (routed via Y)
- final String expr
- = "delete("+COLLECTION_X+", batchSize=50, " // note
batch size
- + " pruneVersionField=true, " // NOTE:
ignoring Y version to del X
- + " search("+COLLECTION_Y+", "
- + " q=\"foo_i:[* TO 10]\", " // 10
matches = 1 batch
- + " rows=100, "
- + " fl=\"id,foo_i,_version_\", " // foo_i
& version should be ignored
- + " sort=\"foo_i desc\")) "
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_Y, // NOTE: Y route
- params("qt", "/stream",
- "expr", expr));
+
+ { // WRITE_X user should be able to delete ids from X via a (search)
stream from Y (routed via
+ // Y)
+ final String expr =
+ "delete("
+ + COLLECTION_X
+ + ", batchSize=50, " // note batch size
+ + " pruneVersionField=true, " //
NOTE: ignoring Y
+ // version to del X
+ + " search("
+ + COLLECTION_Y
+ + ", "
+ + " q=\"foo_i:[* TO 10]\", " //
10 matches = 1 batch
+ + " rows=100, "
+ + " fl=\"id,foo_i,_version_\", " //
foo_i & version
+ // should be ignored
+ + " sort=\"foo_i desc\")) ";
+
+ final SolrStream solrStream =
+ new SolrStream(
+ solrUrl + "/" + COLLECTION_Y, // NOTE: Y route
+ params("qt", "/stream", "expr", expr));
solrStream.setCredentials(WRITE_X_USER, WRITE_X_USER);
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
assertEquals(10L, tuples.get(0).get("batchIndexed"));
assertEquals(10L, tuples.get(0).get("totalIndexed"));
-
}
assertEquals(42L - 1L - 10L, commitAndCountDocsInCollection(COLLECTION_X,
WRITE_X_USER));
assertEquals(42L, commitAndCountDocsInCollection(COLLECTION_Y,
WRITE_Y_USER));
-
- { // WRITE_X user should be able to delete ids from X via a (search)
stream from Y (routed via X)...
- final String expr
- = "delete("+COLLECTION_X+", batchSize=5, " // note
batch size
- + " search("+COLLECTION_Y+", "
- + " q=\"foo_i:[30 TO *]\", " // 13
matches = 3 batches
- + " rows=100, "
- + " fl=\"id,foo_i\", " // foo_i
should be ignored
- + " sort=\"foo_i desc\")) "
- ;
-
- final SolrStream solrStream = new SolrStream(solrUrl + "/" +
COLLECTION_X, // NOTE: X route
- params("qt", "/stream",
- "expr", expr));
+
+ { // WRITE_X user should be able to delete ids from X via a (search)
stream from Y (routed via
+ // X)...
+ final String expr =
+ "delete("
+ + COLLECTION_X
+ + ", batchSize=5, " // note batch size
+ + " search("
+ + COLLECTION_Y
+ + ", "
+ + " q=\"foo_i:[30 TO *]\", " //
13 matches = 3
+ // batches
+ + " rows=100, "
+ + " fl=\"id,foo_i\", " //
foo_i should be
+ // ignored
+ + " sort=\"foo_i desc\")) ";
Review comment:
Fix this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
