Skip to content

Commit b3c2236

Browse files
To-omTo-om
committed
Merge branch 'release/3.0.0-RC4'
2 parents 13ecd33 + 3f4efab commit b3c2236

12 files changed

Lines changed: 111 additions & 31 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Change Log
22

3+
## [3.0.0-RC4](https://github.com/TheHive-Project/Cortex/tree/3.0.0-RC4) (2019-07-10)
4+
5+
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/3.0.0-RC3...3.0.0-RC4)
6+
7+
**Fixed bugs:**
8+
9+
- Responder run displayed as Analyzer run [\#207](https://github.com/TheHive-Project/Cortex/issues/207)
10+
- docker version of cortex breaks when you don't create a user immediately [\#204](https://github.com/TheHive-Project/Cortex/issues/204)
11+
- Login error after Cortex upgrade to 3 [\#199](https://github.com/TheHive-Project/Cortex/issues/199)
12+
- Yara analyzer configuration dialog broken [\#134](https://github.com/TheHive-Project/Cortex/issues/134)
13+
14+
**Closed issues:**
15+
16+
- docker version of cortex prints a lot of errors for auth failures [\#205](https://github.com/TheHive-Project/Cortex/issues/205)
17+
- dockerhub sample uses the wrong port [\#203](https://github.com/TheHive-Project/Cortex/issues/203)
18+
- Custom Responder not showing up in Responders Config Tab [\#201](https://github.com/TheHive-Project/Cortex/issues/201)
19+
- Can't enable some "free" Analyzers [\#200](https://github.com/TheHive-Project/Cortex/issues/200)
20+
321
## [3.0.0-RC3](https://github.com/TheHive-Project/Cortex/tree/3.0.0-RC3) (2019-06-05)
422

523
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/3.0.0-RC2...3.0.0-RC3)
@@ -15,6 +33,7 @@
1533
- Get user detials via API is available to non-admin users [\#194](https://github.com/TheHive-Project/Cortex/issues/194)
1634

1735
## [3.0.0-RC2](https://github.com/TheHive-Project/Cortex/tree/3.0.0-RC2) (2019-05-03)
36+
1837
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/3.0.0-RC1...3.0.0-RC2)
1938

2039
**Fixed bugs:**
@@ -24,6 +43,7 @@
2443
- Docker container exposes tcp/9000 instead of tcp/9001 [\#166](https://github.com/TheHive-Project/Cortex/issues/166)
2544

2645
## [3.0.0-RC1](https://github.com/TheHive-Project/Cortex/tree/3.0.0-RC1) (2019-04-05)
46+
2747
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.3...3.0.0-RC1)
2848

2949
**Implemented enhancements:**
@@ -34,7 +54,7 @@
3454

3555
**Fixed bugs:**
3656

37-
- SSO: Authentication module not found [\#181](https://github.com/TheHive-Project/Cortex/issues/181)
57+
- SSO: Authentication module not found [\#181](https://github.com/TheHive-Project/Cortex/issues/181)
3858
- Akka Dispatcher Blocked [\#170](https://github.com/TheHive-Project/Cortex/issues/170)
3959

4060
**Closed issues:**
@@ -45,6 +65,7 @@
4565
- File extraction [\#120](https://github.com/TheHive-Project/Cortex/issues/120)
4666

4767
## [2.1.3](https://github.com/TheHive-Project/Cortex/tree/2.1.3) (2018-12-20)
68+
4869
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.2...2.1.3)
4970

5071
**Implemented enhancements:**
@@ -62,17 +83,19 @@
6283

6384
**Closed issues:**
6485

65-
- Systemd: cortex.service: Failed with result 'exit-code'. [\#155](https://github.com/TheHive-Project/Cortex/issues/155)
86+
- Systemd: cortex.service: Failed with result 'exit-code'. [\#155](https://github.com/TheHive-Project/Cortex/issues/155)
6687
- conf/logback.xml: Rotate logs [\#62](https://github.com/TheHive-Project/Cortex/issues/62)
6788

6889
## [2.1.2](https://github.com/TheHive-Project/Cortex/tree/2.1.2) (2018-10-12)
90+
6991
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.1...2.1.2)
7092

7193
**Fixed bugs:**
7294

7395
- findSimilarJob function broken [\#144](https://github.com/TheHive-Project/Cortex/issues/144)
7496

7597
## [2.1.1](https://github.com/TheHive-Project/Cortex/tree/2.1.1) (2018-10-09)
98+
7699
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0...2.1.1)
77100

78101
**Implemented enhancements:**
@@ -88,6 +111,7 @@
88111
- Console output should not be logged in syslog [\#136](https://github.com/TheHive-Project/Cortex/issues/136)
89112

90113
## [2.1.0](https://github.com/TheHive-Project/Cortex/tree/2.1.0) (2018-09-25)
114+
91115
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.1.0-RC1...2.1.0)
92116

93117
**Implemented enhancements:**
@@ -98,7 +122,7 @@
98122
**Fixed bugs:**
99123

100124
- MISP API fails [\#109](https://github.com/TheHive-Project/Cortex/issues/109)
101-
- File\_Info issue [\#53](https://github.com/TheHive-Project/Cortex/issues/53)
125+
- File_Info issue [\#53](https://github.com/TheHive-Project/Cortex/issues/53)
102126
- Temporary files are not removed at the end of job [\#129](https://github.com/TheHive-Project/Cortex/issues/129)
103127
- MISP fails to run analyzers [\#128](https://github.com/TheHive-Project/Cortex/issues/128)
104128

@@ -107,6 +131,7 @@
107131
- Update resolvers in build.sbt to contain Maven as a dependency [\#130](https://github.com/TheHive-Project/Cortex/pull/130) ([adl1995](https://github.com/adl1995))
108132

109133
## [2.1.0-RC1](https://github.com/TheHive-Project/Cortex/tree/2.1.0-RC1) (2018-07-31)
134+
110135
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.4...2.1.0-RC1)
111136

112137
**Implemented enhancements:**
@@ -137,6 +162,7 @@
137162
- Update GitHub path [\#100](https://github.com/TheHive-Project/Cortex/pull/100) ([saadkadhi](https://github.com/saadkadhi))
138163

139164
## [2.0.4](https://github.com/TheHive-Project/Cortex/tree/2.0.4) (2018-04-13)
165+
140166
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.3...2.0.4)
141167

142168
**Implemented enhancements:**
@@ -158,6 +184,7 @@
158184
- Insufficient Rights To Perform This Action [\#87](https://github.com/TheHive-Project/Cortex/issues/87)
159185

160186
## [2.0.3](https://github.com/TheHive-Project/Cortex/tree/2.0.3) (2018-04-09)
187+
161188
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.2...2.0.3)
162189

163190
**Implemented enhancements:**
@@ -177,6 +204,7 @@
177204
- Allow configuring auto artifacts extraction per analyzer [\#80](https://github.com/TheHive-Project/Cortex/issues/80)
178205

179206
## [2.0.2](https://github.com/TheHive-Project/Cortex/tree/2.0.2) (2018-04-04)
207+
180208
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.1...2.0.2)
181209

182210
**Fixed bugs:**
@@ -188,6 +216,7 @@
188216
- Session collision when TheHive & Cortex 2 share the same URL [\#70](https://github.com/TheHive-Project/Cortex/issues/70)
189217

190218
## [2.0.1](https://github.com/TheHive-Project/Cortex/tree/2.0.1) (2018-03-30)
219+
191220
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/2.0.0...2.0.1)
192221

193222
**Fixed bugs:**
@@ -197,6 +226,7 @@
197226
- User can't change his password [\#67](https://github.com/TheHive-Project/Cortex/issues/67)
198227

199228
## [2.0.0](https://github.com/TheHive-Project/Cortex/tree/2.0.0) (2018-03-30)
229+
200230
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.1.4...2.0.0)
201231

202232
**Implemented enhancements:**
@@ -219,7 +249,7 @@
219249
- Local, LDAP, AD and API Key Authentication [\#7](https://github.com/TheHive-Project/Cortex/issues/7)
220250
- Limit Rates and Respect Quotas [\#6](https://github.com/TheHive-Project/Cortex/issues/6)
221251
- Persistence and Report Caching [\#5](https://github.com/TheHive-Project/Cortex/issues/5)
222-
- Provide alternative paths for analyzers in addition to standard path. [\#4](https://github.com/TheHive-Project/Cortex/issues/4)
252+
- Provide alternative paths for analyzers in addition to standard path. [\#4](https://github.com/TheHive-Project/Cortex/issues/4)
223253
- Provide way to reload conf file for new API keys without shutdown. [\#3](https://github.com/TheHive-Project/Cortex/issues/3)
224254
- Provide Secret Key auth to upstream service [\#2](https://github.com/TheHive-Project/Cortex/issues/2)
225255

@@ -230,6 +260,7 @@
230260
- Adding WOT config sample [\#43](https://github.com/TheHive-Project/Cortex/pull/43) ([mthlvt](https://github.com/mthlvt))
231261

232262
## [1.1.4](https://github.com/TheHive-Project/Cortex/tree/1.1.4) (2017-09-15)
263+
233264
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.1.3...1.1.4)
234265

235266
**Fixed bugs:**
@@ -243,6 +274,7 @@
243274
- Disable analyzer in configuration file [\#32](https://github.com/TheHive-Project/Cortex/issues/32)
244275

245276
## [1.1.3](https://github.com/TheHive-Project/Cortex/tree/1.1.3) (2017-06-14)
277+
246278
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/debian/1.1.2-2...1.1.3)
247279

248280
**Fixed bugs:**
@@ -251,9 +283,11 @@
251283
- Error when parsing analyzer failure report [\#33](https://github.com/TheHive-Project/Cortex/issues/33)
252284

253285
## [debian/1.1.2-2](https://github.com/TheHive-Project/Cortex/tree/debian/1.1.2-2) (2017-05-24)
286+
254287
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.1.2...debian/1.1.2-2)
255288

256289
## [1.1.2](https://github.com/TheHive-Project/Cortex/tree/1.1.2) (2017-05-24)
290+
257291
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/debian/1.1.1-2...1.1.2)
258292

259293
**Implemented enhancements:**
@@ -268,16 +302,19 @@
268302
- Error 500 in TheHive when a job is submited to Cortex [\#27](https://github.com/TheHive-Project/Cortex/issues/27)
269303

270304
## [debian/1.1.1-2](https://github.com/TheHive-Project/Cortex/tree/debian/1.1.1-2) (2017-05-19)
305+
271306
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/rpm/1.1.1-2...debian/1.1.1-2)
272307

273308
## [rpm/1.1.1-2](https://github.com/TheHive-Project/Cortex/tree/rpm/1.1.1-2) (2017-05-19)
309+
274310
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.1.1...rpm/1.1.1-2)
275311

276312
**Fixed bugs:**
277313

278314
- After Upgrade from Cortex 1.0.2 to 1.1.1 system does not come up [\#26](https://github.com/TheHive-Project/Cortex/issues/26)
279315

280316
## [1.1.1](https://github.com/TheHive-Project/Cortex/tree/1.1.1) (2017-05-17)
317+
281318
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.1.0...1.1.1)
282319

283320
**Fixed bugs:**
@@ -290,6 +327,7 @@
290327
- MISP integration [\#21](https://github.com/TheHive-Project/Cortex/issues/21)
291328

292329
## [1.1.0](https://github.com/TheHive-Project/Cortex/tree/1.1.0) (2017-05-12)
330+
293331
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.0.2...1.1.0)
294332

295333
**Implemented enhancements:**
@@ -304,6 +342,7 @@
304342
- Use new logo and favicon [\#22](https://github.com/TheHive-Project/Cortex/issues/22)
305343

306344
## [1.0.2](https://github.com/TheHive-Project/Cortex/tree/1.0.2) (2017-04-19)
345+
307346
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.0.1...1.0.2)
308347

309348
**Fixed bugs:**
@@ -319,6 +358,7 @@
319358
- Documentation on 'How to create an analyzer' [\#10](https://github.com/TheHive-Project/Cortex/issues/10)
320359

321360
## [1.0.1](https://github.com/TheHive-Project/Cortex/tree/1.0.1) (2017-03-08)
361+
322362
[Full Changelog](https://github.com/TheHive-Project/Cortex/compare/1.0.0...1.0.1)
323363

324364
**Fixed bugs:**
@@ -331,5 +371,4 @@
331371

332372
## [1.0.0](https://github.com/TheHive-Project/Cortex/tree/1.0.0) (2017-02-01)
333373

334-
335-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
374+
\* _This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)_

‎conf/application.sample‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,39 @@
1212
search {
1313
# Name of the index
1414
index = cortex
15-
# Name of the ElasticSearch cluster
16-
cluster = hive
17-
# Address of the ElasticSearch instance
18-
host = ["127.0.0.1:9300"]
15+
# ElasticSearch instance address.
16+
uri = "http://127.0.0.1:9200/"
17+
18+
## Advanced configuration
19+
# Scroll keepalive.
20+
#keepalive = 1m
21+
# Scroll page size.
22+
#pagesize = 50
23+
# Number of shards
24+
#nbshards = 5
25+
# Number of replicas
26+
#nbreplicas = 1
27+
# Arbitrary settings
28+
#settings {
29+
# # Maximum number of nested fields
30+
# mapping.nested_fields.limit = 100
31+
#}
32+
33+
## Authentication configuration
34+
#search.username = ""
35+
#search.password = ""
36+
37+
## SSL configuration
38+
#search.keyStore {
39+
# path = "/path/to/keystore"
40+
# type = "JKS" # or PKCS12
41+
# password = "keystore-password"
42+
#}
43+
#search.trustStore {
44+
# path = "/path/to/trustStore"
45+
# type = "JKS" # or PKCS12
46+
# password = "trustStore-password"
47+
#}
1948
}
2049

2150
## Cache

‎docker/cortex/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- thread_pool.search.queue_size=100000
1010
- thread_pool.bulk.queue_size=100000
1111
cortex:
12-
image: thehiveproject/cortex:latest
12+
image: thehiveproject/cortex:3.0.0-RC4
1313
depends_on:
1414
- elasticsearch
1515
ports:

‎project/Dependencies.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object Dependencies {
1818

1919
val reflections = "org.reflections" % "reflections" % "0.9.11"
2020
val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
21-
val elastic4play = "org.thehive-project" %% "elastic4play" % "1.11.3"
21+
val elastic4play = "org.thehive-project" %% "elastic4play" % "1.11.4"
2222
val dockerClient = "com.spotify" % "docker-client" % "8.14.4"
2323
}
2424

‎version.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "3.0.0-RC3"
1+
version in ThisBuild := "3.0.0-RC4"

‎www/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cortex",
3-
"version": "3.0.0-RC3",
3+
"version": "3.0.0-RC4",
44
"description": "A powerfull observable analysis engine",
55
"license": "AGPL-3.0-or-later",
66
"homepage": "https://github.com/TheHive-Project/Cortex",
@@ -75,4 +75,4 @@
7575
"webpack": "^3.5.0",
7676
"webpack-dev-server": "^2.2.0"
7777
}
78-
}
78+
}

‎www/src/app/components/user-dialog/user.edit.controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default class UserEditController {
9999
if (this.user.id) {
100100
promise = this.UserService.update(this.user.id, postData);
101101
} else {
102-
postData.login = _.lowerCase(this.formData.id);
102+
postData.login = _.toLower(this.formData.id);
103103
promise = this.UserService.save(postData);
104104
}
105105

‎www/src/app/pages/admin/common/user-dialog/user.edit.controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export default class UserEditController {
107107
if (this.user.id) {
108108
promise = this.UserService.update(this.user.id, postData);
109109
} else {
110-
postData.login = _.lowerCase(this.formData.id);
110+
postData.login = _.toLower(this.formData.id);
111111
promise = this.UserService.save(postData);
112112
}
113113

‎www/src/app/pages/jobs/components/jobs.list.html‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
<div class="row mv-s" ng-if="$ctrl.jobs.length > 0">
1515
<div class="col-sm-12 flex-table">
1616
<div class="flex-header media">
17-
<div class="flex-col flex-w-100 text-center">Status</div>
17+
<div class="flex-col flex-w-100 text-center">Status</div>
1818
<div class="flex-col flex-1">Job details</div>
1919
<div class="flex-col flex-w-120 text-center">TLP</div>
2020
<div class="flex-col flex-w-120 text-center">PAP</div>
2121
<div class="flex-col flex-w-100"></div>
2222
<div class="flex-col flex-w-100" require-roles="orgadmin,analyze"></div>
2323
</div>
24-
<div class="flex-row media" ng-repeat="job in $ctrl.jobs track by job.id" ng-init="isFile = job.dataType ==='file'">
24+
<div class="flex-row media" ng-repeat="job in $ctrl.jobs track by job.id"
25+
ng-init="isFile = job.dataType ==='file'">
2526
<div class="flex-col flex-w-100 vertical centered">
2627
<span class="label label-lg label-default" ng-class="{
2728
'Success': 'label-success',
@@ -30,13 +31,14 @@
3031
</div>
3132
<div class="flex-col flex-1">
3233
<h4 class="media-heading text-primary">
33-
<strong>[{{job.dataType}}]</strong>
34-
<span ng-if="job.type !== 'responder'">{{(isFile ? job.attachment.name : job.data) | fang | limitTo:200}}</span>
34+
<strong>[{{job.dataType}}]</strong>
35+
<span
36+
ng-if="job.type !== 'responder'">{{(isFile ? job.attachment.name : job.data) | fang | limitTo:200}}</span>
3537
<span ng-if="job.type === 'responder'">{{job.label || 'No Label'}}</span>
3638
</h4>
3739
<div class="row mv-xs text-muted">
3840
<div class="col-sm-4">
39-
<strong>Analyzer:</strong>
41+
<strong class="text-capitalized">{{ job.type }}:</strong>
4042
<span>{{job.analyzerName}}</span>
4143
</div>
4244
<div class="col-sm-4">
@@ -46,11 +48,12 @@ <h4 class="media-heading text-primary">
4648
<div class="col-sm-4">
4749
<strong>User:</strong>
4850
<span>{{job.organization}}/{{job.createdBy}}</span>
49-
</div>
51+
</div>
5052
</div>
5153
<div ng-if="job.status === 'Failure'" class="row text-danger wrap">
5254
<div class="col-sm-12">
53-
<a class="text-danger" href ng-click="job.showError = !!!job.showError">{{job.showError ? 'Hide' : 'Show'}} error</a>
55+
<a class="text-danger" href
56+
ng-click="job.showError = !!!job.showError">{{job.showError ? 'Hide' : 'Show'}} error</a>
5457
<pre ng-show="job.showError" class="error-trace">{{job.message}}</pre>
5558
</div>
5659
</div>
@@ -72,4 +75,4 @@ <h4 class="media-heading text-primary">
7275
</div>
7376
</div>
7477
</div>
75-
</section>
78+
</section>

‎www/src/app/pages/login/login.controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default class LoginController {
2727
}
2828

2929
login() {
30-
this.params.username = _.lowerCase(this.params.username);
30+
this.params.username = _.toLower(this.params.username);
3131

3232
this.AuthService.login(this.params.username, this.params.password)
3333
.then(() => this.$state.go('index'))

0 commit comments

Comments
 (0)