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

[AUTO] Increment version to 1.3.6-SNAPSHOT #2119

Closed
wants to merge 1 commit into from
Closed

[AUTO] Increment version to 1.3.6-SNAPSHOT #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/test/java/org/opensearch/security/HttpIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ public void testTenantInfo() throws Exception {
/*

[admin_1, praxisrw, abcdef_2_2, kltentro, praxisro, kltentrw]
admin_1==.kibana_-1139640511_admin1
admin_1==.kibana_-1.3.640511_admin1
praxisrw==.kibana_-1386441176_praxisrw
abcdef_2_2==.kibana_-634608247_abcdef22
kltentro==.kibana_-2014056171_kltentro
Expand All @@ -662,7 +662,7 @@ public void testTenantInfo() throws Exception {
try (TransportClient tc = getInternalTransportClient(this.clusterInfo, Settings.EMPTY)) {

tc.index(new IndexRequest(".kibana-6").type("doc").setRefreshPolicy(RefreshPolicy.IMMEDIATE).source("{\"content\":2}", XContentType.JSON)).actionGet();
tc.index(new IndexRequest(".kibana_-1139640511_admin1").type("doc").setRefreshPolicy(RefreshPolicy.IMMEDIATE).source("{\"content\":3}", XContentType.JSON)).actionGet();
tc.index(new IndexRequest(".kibana_-1.3.640511_admin1").type("doc").setRefreshPolicy(RefreshPolicy.IMMEDIATE).source("{\"content\":3}", XContentType.JSON)).actionGet();
tc.index(new IndexRequest(".kibana_-1386441176_praxisrw").type("doc").setRefreshPolicy(RefreshPolicy.IMMEDIATE).source("{\"content\":3}", XContentType.JSON)).actionGet();
tc.index(new IndexRequest(".kibana_-634608247_abcdef22").type("doc").setRefreshPolicy(RefreshPolicy.IMMEDIATE).source("{\"content\":3}", XContentType.JSON)).actionGet();
tc.index(new IndexRequest(".kibana_-12345_123456").type("doc").setRefreshPolicy(RefreshPolicy.IMMEDIATE).source("{\"content\":3}", XContentType.JSON)).actionGet();
Expand All @@ -687,7 +687,7 @@ public void testTenantInfo() throws Exception {
res = rh.executeGetRequest("_opendistro/_security/tenantinfo?pretty", encodeBasicHeader("kibanaserver", "kibanaserver"));
System.out.println(res.getBody());
Assert.assertEquals(HttpStatus.SC_OK, res.getStatusCode());
Assert.assertTrue(res.getBody().contains("\".kibana_-1139640511_admin1\" : \"admin_1\""));
Assert.assertTrue(res.getBody().contains("\".kibana_-1.3.640511_admin1\" : \"admin_1\""));
Assert.assertTrue(res.getBody().contains("\".kibana_-1386441176_praxisrw\" : \"praxisrw\""));
Assert.assertTrue(res.getBody().contains(".kibana_-2014056163_kltentrw\" : \"kltentrw\""));
Assert.assertTrue(res.getBody().contains("\".kibana_-634608247_abcdef22\" : \"abcdef_2_2\""));
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/opensearch/security/dlic/dlsfls/CustomFieldMaskedComplexMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public void testComplexMappingSearch() throws Exception {
HttpResponse res;

Assert.assertEquals(HttpStatus.SC_OK, (res = rh.executeGetRequest("/logs/_search?pretty&size=100", encodeBasicHeader("admin", "admin"))).getStatusCode());
Assert.assertFalse(res.getBody().contains("88783587fef740690c4fa39476fb86314d034fa3370e1a1fa186f6d9d4644a18ad85063c1e3161f8929f7ca019bb8740611eaf337709113901e7c3a6b59f4166"));
Assert.assertFalse(res.getBody().contains("88783587fef740690c4fa39476fb86314d034fa3370e1a1fa186f6d9d4644a18ad85063c1.3.61f8929f7ca019bb8740611eaf337709113901e7c3a6b59f4166"));
Assert.assertFalse(res.getBody().contains("e90a2fdf7b1939ec06e294321fd7d23e1a70d8fc080a3f85d0f3bf08c205b53"));
Assert.assertFalse(res.getBody().contains("*.*.*.*"));
Assert.assertFalse(res.getBody().contains("430a65d4b9c51de7192e048b2639db0de5c56f1901afccc2a01ef97f6a769a38"));
Expand All @@ -179,7 +179,7 @@ public void testComplexMappingSearch() throws Exception {
for(int i=0;i<10;i++) {

Assert.assertEquals(HttpStatus.SC_OK, (res = rh.executeGetRequest("/logs/_search?pretty&size=100", encodeBasicHeader("user_masked_nowc", "password"))).getStatusCode());
Assert.assertTrue(res.getBody().contains("88783587fef740690c4fa39476fb86314d034fa3370e1a1fa186f6d9d4644a18ad85063c1e3161f8929f7ca019bb8740611eaf337709113901e7c3a6b59f4166"));
Assert.assertTrue(res.getBody().contains("88783587fef740690c4fa39476fb86314d034fa3370e1a1fa186f6d9d4644a18ad85063c1.3.61f8929f7ca019bb8740611eaf337709113901e7c3a6b59f4166"));
Assert.assertTrue(res.getBody().contains("e90a2fdf7b1939ec06e294321fd7d23e1a70d8fc080a3f85d0f3bf08c205b53"));
Assert.assertTrue(res.getBody().contains("*.*.*.*"));
Assert.assertTrue(res.getBody().contains("430a65d4b9c51de7192e048b2639db0de5c56f1901afccc2a01ef97f6a769a38"));
Expand All @@ -195,7 +195,7 @@ public void testComplexMappingSearch() throws Exception {
}

Assert.assertEquals(HttpStatus.SC_OK, (res = rh.executeGetRequest("/logs/_search?pretty&size=100", encodeBasicHeader("admin", "admin"))).getStatusCode());
Assert.assertFalse(res.getBody().contains("88783587fef740690c4fa39476fb86314d034fa3370e1a1fa186f6d9d4644a18ad85063c1e3161f8929f7ca019bb8740611eaf337709113901e7c3a6b59f4166"));
Assert.assertFalse(res.getBody().contains("88783587fef740690c4fa39476fb86314d034fa3370e1a1fa186f6d9d4644a18ad85063c1.3.61f8929f7ca019bb8740611eaf337709113901e7c3a6b59f4166"));
Assert.assertFalse(res.getBody().contains("e90a2fdf7b1939ec06e294321fd7d23e1a70d8fc080a3f85d0f3bf08c205b53"));
Assert.assertFalse(res.getBody().contains("*.*.*.*"));
Assert.assertFalse(res.getBody().contains("430a65d4b9c51de7192e048b2639db0de5c56f1901afccc2a01ef97f6a769a38"));
Expand Down
Binary file modified src/test/resources/auditlog/spock-keystore.p12
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/test/resources/dlsfls/logs_bulk_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{"index":{"_index":"logs","_type":"_doc"}}
{"referer":"http://www.elastic-elastic-elastic.com/success/frederick-w-leslie","clientip":"159.64.35.129","response":"200","tags":["success","info"],"message":"159.64.35.129 - - [2018-07-22T06:06:42.742Z] \"GET /kibana/kibana-6.3.2-linux-x86_64.tar.gz HTTP/1.1\" 200 8489 \"-\" \"Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1\"","request":"/kibana/kibana-6.3.2-linux-x86_64.tar.gz","geo":{"srcdest":"ET:BG","src":"ET","dest":"BG","coordinates":{"lat":28.03925,"lon":-97.54244444}},"phpmemory":null,"extension":"gz","index":"kibana_sample_data_logs","url":"https://artifacts.elastic.co/downloads/kibana/kibana-6.3.2-linux-x86_64.tar.gz","memory":null,"host":"artifacts.elastic.co","utc_time":"2018-07-22T06:06:42.742Z","machine":{"ram":16106127360,"os":"win xp"},"agent":"Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1","ip":"159.64.35.129","bytes":8489,"timestamp":"2018-07-22T06:06:42.742Z"}
{"index":{"_index":"logs","_type":"_doc"}}
{"referer":"http://www.elastic-elastic-elastic.com/success/lev-dyomin","clientip":"55.78.184.201","response":"200","tags":["success","info"],"message":"55.78.184.201 - - [2018-07-22T07:58:21.667Z] \"GET / HTTP/1.1\" 200 9029 \"-\" \"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)\"","request":"/","geo":{"srcdest":"IN:NP","src":"IN","dest":"NP","coordinates":{"lat":61.58317306,"lon":-159.2359667}},"phpmemory":null,"extension":"","index":"kibana_sample_data_logs","url":"https://www.elastic.co/downloads","memory":null,"host":"www.elastic.co","utc_time":"2018-07-22T07:58:21.667Z","machine":{"ram":17179869184,"os":"win 7"},"agent":"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)","ip":"55.78.184.201","bytes":9029,"timestamp":"2018-07-22T07:58:21.667Z"}
{"referer":"http://www.elastic-elastic-elastic.com/success/lev-dyomin","clientip":"55.78.184.201","response":"200","tags":["success","info"],"message":"55.78.184.201 - - [2018-07-22T07:58:21.667Z] \"GET / HTTP/1.1\" 200 9029 \"-\" \"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)\"","request":"/","geo":{"srcdest":"IN:NP","src":"IN","dest":"NP","coordinates":{"lat":61.5831.3.6,"lon":-159.2359667}},"phpmemory":null,"extension":"","index":"kibana_sample_data_logs","url":"https://www.elastic.co/downloads","memory":null,"host":"www.elastic.co","utc_time":"2018-07-22T07:58:21.667Z","machine":{"ram":17179869184,"os":"win 7"},"agent":"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)","ip":"55.78.184.201","bytes":9029,"timestamp":"2018-07-22T07:58:21.667Z"}
{"index":{"_index":"logs","_type":"_doc"}}
{"referer":"http://www.elastic-elastic-elastic.com/success/christer-fuglesang","clientip":"110.78.46.100","response":"200","tags":["error","info"],"message":"110.78.46.100 - - [2018-07-22T06:07:42.246Z] \"GET /beats/metricbeat/metricbeat-6.3.2-amd64.deb HTTP/1.1\" 200 2860 \"-\" \"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)\"","request":"/beats/metricbeat/metricbeat-6.3.2-amd64.deb","geo":{"srcdest":"CN:ID","src":"CN","dest":"ID","coordinates":{"lat":43.3221425,"lon":-84.68794917}},"phpmemory":null,"extension":"deb","index":"kibana_sample_data_logs","url":"https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-6.3.2-amd64.deb","memory":null,"host":"artifacts.elastic.co","utc_time":"2018-07-22T06:07:42.246Z","machine":{"ram":32212254720,"os":"ios"},"agent":"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)","ip":"110.78.46.100","bytes":2860,"timestamp":"2018-07-22T06:07:42.246Z"}
{"index":{"_index":"logs","_type":"_doc"}}
Expand Down
Binary file modified src/test/resources/ssl/spock-keystore.p12
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/test/resources/sslConfigurator/pem/root-ca.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ EUV4YW1wbGUgQ29tLCBJbmMuMQswCQYDVQQLDAJDQTEcMBoGA1UEAwwTcm9vdC5j
YS5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJC0
QIvdszKl5IMDurJdaFnWTW7Kcmoos91dDjrD3WxdnEnDTgXskX7UuW7VPc1uuXyU
cK1eqYq0XJWqqxtU+ufW/BUb8wZr5I5gm0RdnQQUfBj+qDR4ACKE3XbG2hC/G+iN
Lz70EHQFukGMQkdMtnday9t5K2FN0rEs1H/B1G3C6ynlR9437gYRvwsS9WrJJ+Yj
Lz70EHQFukGMQkdMtnday9t5K2FN0rEs1H/B1.3.6ynlR9437gYRvwsS9WrJJ+Yj
D8pN277oQ23px9R3OjCVstV0cCmlVkjHncI4b6NGrscG4baOcGOlmzVuTf9orzFs
eg81B2ZiGE4uTyMnbbO3uYKhP/8bw4001Tx1VdDEHwTIDIYzkgGR+RWZFcKRKwSk
Vfvm8oRb+VakdpTeniECAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME
Expand Down