diff --git a/.drone.yml b/.drone.yml
index bec436627a..1d73a49aa7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,16 +1,9 @@
---
kind: pipeline
name: default
-
-# Disable default clone
-clone:
- disable: true
+type: docker
steps:
- # This clone step doesn't use "root" user
- - name: clone
- image: plugins/git:next
-
# Restore cache of downloaded dependencies
- name: restore-cache
image: drillster/drone-volume-cache
@@ -27,8 +20,7 @@ steps:
- name: run-tests
image: thehiveproject/drone-scala-node
commands:
- - . ~/.nvm/nvm.sh
- - sbt -Duser.home=$PWD test stage
+ - sbt -Duser.home=$PWD test:compile test
# Build packages
- name: build-packages
@@ -37,9 +29,23 @@ steps:
pgp_key: {from_secret: pgp_key}
commands:
- |
+ V=$(sbt -no-colors --error "print thehive/version" | tail -1)
+ if ( echo $V | grep -qi snapshot)
+ then
+ exit 1
+ fi
. ~/.nvm/nvm.sh
[ -n "$PLUGIN_PGP_KEY" ] && gpg --batch --import - <<< $PLUGIN_PGP_KEY
sbt -Duser.home=$PWD docker:stage debian:packageBin rpm:packageBin universal:packageBin
+ if ( echo $V | grep -qi rc )
+ then
+ echo $( echo $V | sed -re 's/([0-9]+.[0-9]+.[0-9]+)-RC([0-9]+)-([0-9]+)/\1-RC\2,\1-RC\2-\3/' ) > .tags
+ else
+ echo $( echo $V | sed -re 's/([0-9]+).([0-9]+).([0-9]+)-([0-9]+)/\1,\1.\2,\1.\2.\3,\1.\2.\3-\4,latest/' ) > .tags
+ fi
+ echo $V > thehive-version.txt
+ mv target/rpm/RPMS/noarch/thehive*.rpm target/
+ mv target/universal/thehive*.zip target/
when:
event: [tag]
@@ -48,156 +54,89 @@ steps:
image: drillster/drone-volume-cache
settings:
rebuild: true
+ backend: "filesystem"
mount:
- .sbt
- .ivy2
+ - .cache
- ui/node_modules
- ui/bower_components
volumes: [{name: cache, path: /cache}]
- - name: publish-package
- image: thehiveproject/drone-bintray
+ # Send packages using scp
+ - name: send packages
+ image: appleboy/drone-scp
settings:
- user: {from_secret: bintray_user}
- key: {from_secret: bintray_key}
- subject: thehive-project
- package: thehive
- commands:
- - |
- export PLUGIN_USER
- export PLUGIN_KEY
- export PLUGIN_SUBJECT
- export PLUGIN_PACKAGE
- export PLUGIN_VERSION=$(cut -d\" -f2 version.sbt)
- echo "Publishing package version $PLUGIN_VERSION"
-
- if echo $PLUGIN_VERSION | grep -qvi -E \
- -e '^[0-9]+\.[0-9]+\.[0-9]+$' \
- -e '^[0-9]+\.[0-9]+\.[0-9]+-[0-9]+$' \
- -e '^[0-9]+\.[0-9]+\.[0-9]+-RC[0-9]+$'; then
- echo The version $PLUGIN_VERSION has invalid format
- exit 1
- fi
-
- CHANNEL=stable
- if $(echo $PLUGIN_VERSION | grep -qi rc)
- then
- CHANNEL=beta
- V=$(echo $PLUGIN_VERSION | sed -e 's/-\([rR][cC]\)/-0.1\1/')
- DEB_FILE=target/thehive_$${V}_all.deb
- RPM_FILE=target/rpm/RPMS/noarch/thehive-$${V}.noarch.rpm
- else
- DEB_FILE=target/thehive_$${PLUGIN_VERSION}_all.deb
- RPM_FILE=target/rpm/RPMS/noarch/thehive-$${PLUGIN_VERSION}.noarch.rpm
- fi
-
- ZIP_FILE=target/universal/thehive-$${PLUGIN_VERSION}.zip
-
- upload \
- --file $DEB_FILE \
- --repo debian-beta \
- --extra-param deb_distribution=any \
- --extra-param deb_component=main \
- --extra-param deb_architecture=all
-
- [ $CHANNEL = stable ] && upload \
- --file $DEB_FILE \
- --repo debian-stable \
- --extra-param deb_distribution=any \
- --extra-param deb_component=main \
- --extra-param deb_architecture=all
-
- upload \
- --file $RPM_FILE \
- --repo rpm-beta
-
- [ $CHANNEL = stable ] && upload \
- --file $RPM_FILE \
- --repo rpm-stable
-
- upload \
- --file $ZIP_FILE \
- --repo binary
-
- LATEST_VERSION=latest
- [ $CHANNEL = beta ] && LATEST_VERSION=latest-beta
-
- removeVersion \
- --repo binary \
- --version $LATEST_VERSION
+ host: {from_secret: package_host}
+ username: {from_secret: package_user}
+ key: {from_secret: package_key}
+ target: {from_secret: incoming_path}
+ source:
+ - target/thehive*.deb
+ - target/thehive*.rpm
+ - target/thehive*.zip
+ strip_components: 1
+ when:
+ event: [tag]
- upload \
- --file $ZIP_FILE \
- --repo binary \
- --version $LATEST_VERSION \
- --dest-file thehive-$${LATEST_VERSION}.zip
+ # Publish packages
+ - name: publish packages
+ image: appleboy/drone-ssh
+ settings:
+ host: {from_secret: package_host}
+ user: {from_secret: package_user}
+ key: {from_secret: package_key}
+ publish_script: {from_secret: publish_script}
+ commands:
+ - PLUGIN_SCRIPT="bash $PLUGIN_PUBLISH_SCRIPT thehive $(cat thehive-version.txt)" /bin/drone-ssh
when:
event: [tag]
- # Publish docker image
+ # Publish docker image on Docker Hub
- name: docker
image: plugins/docker
settings:
context: target/docker/stage
dockerfile: target/docker/stage/Dockerfile
repo: thehiveproject/thehive
- auto_tag: true
username: {from_secret: docker_username}
password: {from_secret: docker_password}
when:
event: [tag]
- # Deploy binaries in integration environment
- - name: copy binaries in integration environment
- image: appleboy/drone-scp
- settings:
- host: {from_secret: deploy_beta_host}
- username: {from_secret: deploy_username}
- key: {from_secret: deploy_key}
- target: ./thehive-builds/${DRONE_BUILD_NUMBER}
- source: target/universal/stage
- strip_components: 3
- when:
- branch: [develop]
- event: {exclude: [pull_request]}
-
- - name: deploy binaries in integration environment
- image: appleboy/drone-ssh
- settings:
- host: {from_secret: deploy_beta_host}
- username: {from_secret: deploy_username}
- key: {from_secret: deploy_key}
- script:
- - ./start thehive ${DRONE_BUILD_NUMBER}
- when:
- branch: [develop]
- event: {exclude: [pull_request]}
-
- # Deploy binaries in staging environment
- - name: copy binaries in staging environment
- image: appleboy/drone-scp
+ # Publish docker image on Harbor
+ - name: harbor
+ image: plugins/docker
settings:
- host: {from_secret: deploy_stable_host}
- username: {from_secret: deploy_username}
- key: {from_secret: deploy_key}
- target: ./thehive-builds/${DRONE_BUILD_NUMBER}
- source: target/universal/stage
- strip_components: 3
+ context: target/docker/stage
+ dockerfile: target/docker/stage/Dockerfile
+ registry: {from_secret: harbor_registry}
+ repo: {from_secret: harbor_repo}
+ username: {from_secret: harbor_username}
+ password: {from_secret: harbor_password}
when:
- branch: [master]
- event: {exclude: [pull_request]}
+ event: [tag]
- - name: deploy binaries in staging environment
- image: appleboy/drone-ssh
+ - name: send message
+ image: thehiveproject/drone_keybase
settings:
- host: {from_secret: deploy_stable_host}
- username: {from_secret: deploy_username}
- key: {from_secret: deploy_key}
- script:
- - ./start thehive ${DRONE_BUILD_NUMBER}
+ username: {from_secret: keybase_username}
+ paperkey: {from_secret: keybase_paperkey}
+ channel: {from_secret: keybase_channel}
+ commands:
+ - |
+ keybase oneshot -u "$PLUGIN_USERNAME" --paperkey "$PLUGIN_PAPERKEY"
+ URL="$DRONE_SYSTEM_PROTO://$DRONE_SYSTEM_HOST/$DRONE_REPO/$DRONE_BUILD_NUMBER"
+ if [ $DRONE_BUILD_STATUS = "success" ]
+ then
+ keybase chat send "$PLUGIN_CHANNEL" ":white_check_mark: $DRONE_REPO: build succeeded $URL"
+ else
+ keybase chat send "$PLUGIN_CHANNEL" ":x: $DRONE_REPO: build failed $URL"
+ fi
when:
- branch: [master]
- event: {exclude: [pull_request]}
+ status:
+ - success
+ - failure
volumes:
- name: cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f7833080..8825d1ec63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
# Change Log
+## [3.5.0-RC1](https://github.com/TheHive-Project/TheHive/milestone/44) (2020-08-12)
+
+**Implemented enhancements:**
+
+- Support of ElasticSearch 7 [\#1377](https://github.com/TheHive-Project/TheHive/issues/1377)
+- [Enhancement] MISP sync [\#1398](https://github.com/TheHive-Project/TheHive/issues/1398)
+
+**Closed issues:**
+
+- OAuth2 not working : Authentication failure [\#946](https://github.com/TheHive-Project/TheHive/issues/946)
+
+**Fixed bugs:**
+
+- [Bug] OAuth2/OpenIDC Authentication failure [\#1291](https://github.com/TheHive-Project/TheHive/issues/1291)
+- [Feature Request] OAuth support for Basic authentication to authorization server's tokenUrl [\#1294](https://github.com/TheHive-Project/TheHive/issues/1294)
+- [Bug] Can't auth with SSO/OAuth with FusionAuth [\#1342](https://github.com/TheHive-Project/TheHive/issues/1342)
+- [Bug] TheHive is stalled while importing Alerts with a large number of observables [\#1416](https://github.com/TheHive-Project/TheHive/issues/1416)
+
## [3.4.2](https://github.com/TheHive-Project/TheHive/milestone/57) (2020-04-25)
**Implemented enhancements:**
diff --git a/build.sbt b/build.sbt
index 82efa88501..992f41566f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,6 @@
import Common._
import Dependencies._
+import org.thp.ghcl.Milestone
lazy val thehiveBackend = (project in file("thehive-backend"))
.enablePlugins(PlayScala)
@@ -17,6 +18,7 @@ lazy val thehiveBackend = (project in file("thehive-backend"))
Library.zip4j,
Library.reflections,
Library.akkaCluster,
+ Library.akkaClusterTyped,
Library.akkaClusterTools
),
play.sbt.routes.RoutesKeys.routesImport -= "controllers.Assets.Asset"
@@ -105,6 +107,8 @@ rpmReleaseFile := {
rpmFile
}
+milestoneFilter := ((milestone: Milestone) ⇒ milestone.title.head < '4')
+
bintrayOrganization := Some("thehive-project")
// Front-end //
diff --git a/contrib/.gitignore b/contrib/.gitignore
deleted file mode 100644
index 71d918b0bb..0000000000
--- a/contrib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-report-templates/*.zip
diff --git a/contrib/report-templates/Abuse_Finder_1.0/long.html b/contrib/report-templates/Abuse_Finder_1.0/long.html
deleted file mode 100644
index ee902b1b50..0000000000
--- a/contrib/report-templates/Abuse_Finder_1.0/long.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Abuse Finder Information for {{artifact.data}}
-
-
-
- - Names:
- -
-
- {{name}}
-
-
-
-
- - Abuse addresses:
- -
-
- {{abuse}}
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
- DNSDB Domain Name History Report (RRSET)
-
-
-
-
- | # |
- bailiwick |
- count |
- rdata |
- rrname |
- time first |
- time last |
-
-
-
-
- | {{$index+1}} |
- {{row.bailiwick}} |
- {{row.count}} |
-
- {{rdata}}
- |
- {{row.rrname}} |
- {{(row.zone_time_first || row.time_first) | shortDate}} |
- {{(row.zone_time_last || row.time_last) | shortDate}} |
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
- DNSDB IP History Report
- (Rdata IP)
-
-
-
-
- | # |
- count |
- rdata |
- rrname |
- rrtype |
- time first |
- time last |
-
-
-
- {{$index + 1}} |
- {{row.count}} |
- {{row.rdata}} |
- class="wrap"{{row.rrname}} |
- {{row.rrtype}} |
- {{(row.zone_time_first || row.time_first) | shortDate}} |
- {{(row.zone_time_last || row.time_last) | shortDate}} |
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
- DNSDB Name History Report(Rdata Name)
-
-
-
-
- | # |
- count |
- rdata |
- rrname |
- rrtype |
- time first |
- time last |
-
-
-
- {{$index + 1}} |
- {{row.count}} |
- {{row.rdata}} |
- {{row.rrname}} |
- {{row.rrtype}} |
- {{row.time_first | shortDate}} |
- {{row.time_last | shortDate}} |
-
-
-
-
-
- {{artifact.data | fang}}
-
-
-
- - Domains count
- - {{content.ip_addresses.domain_count}}
-
-
- - Domain Names
- -
-
-
-
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{artifact.data | fang}}
-
-
-
- - Name Server
- - {{content.name_server.hostname}}
-
-
- - Primary domains
- -
- {{content.name_server.primary}}
- Show all
-
-
-
- - Secondary domains
- -
- {{content.name_server.secondary}}
- Show all
-
-
-
-
-
Primary Domains List
-
{{content.primary_domains | json}}
-
-
-
Secondary Domains List
-
{{content.secondary_domains | json}}
-
-
-
-
-
- {{artifact.data | fang}}
-
-
-
- - Current Domains
- - {{content.domain_count.current}}
-
-
- - Historic Domains
- - {{content.domain_count.historic}}
-
-
- - Domains
- -
-
-
-
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
No records found
-
-
-
- | # |
- date |
- server names |
- registrant |
- registrar |
- expiration |
- statuses |
-
-
-
- {{$index + 1}} |
- {{row.date}} |
-
-
- |
- {{row.whois.registrant}} |
- {{row.whois.registration.registrar}} |
- {{row.whois.registration.expires}} |
-
-
- |
-
-
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{artifact.data | fang}}
-
-
-
- - Date of record
- - {{content.whois.date}}
-
-
{{content.whois.record}}
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{artifact.data | fang}}
-
-
-
- - Date of record
- - {{content.whois.date}}
-
-
{{content.whois.record}}
-
-
-
-
-
-
-
- File Identification
-
-
-
- - MD5
- - {{content.Identification['MD5']}}
-
-
- - SHA1
- - {{content.Identification['SHA1']}}
-
-
- - SHA256
- - {{content.Identification['SHA256']}}
-
-
- - impash
- - {{content.Identification['impash']|| "-"}}
-
-
-
- - ssdeep
- - {{content.Identification['ssdeep']|| "-"}}
-
-
-
- - pehash
- - {{content.Identification['pehash']|| "-"}}
-
-
-
- - Operating System
- - {{content.Identification['OperatingSystem']}}
-
-
-
- - PE Type
- - {{content.Identification['PEType']}}
-
-
- - Magic literal
- - {{content.Magic}}
-
-
- - MimeType
- - {{content.Mimetype}}
-
-
-
-
-
-
-
- File Metadata (Exiftool)
-
-
-
-
-
-
-
- PE Basic Information
-
-
-
- - {{I.Info}}
- - {{I.Value}}
-
-
- - Compilation Timestamp
- - {{content.PE.BasicInformation.CompilationTimestamp}}
-
-
- - File Size
- - {{content.PE.BasicInformation.FileSize}}
-
-
- - Entry Point (EP)
- - {{content.PE.BasicInformation.EntryPoint}}
-
-
- - Target Machine
- - {{content.PE.BasicInformation.TargetMachine}}
-
-
-
-
-
-
-
- PE Sections
-
-
-
-
- | Section |
- SizeOfRawData |
- Entroy |
-
-
-
- |
- {{section.entryname}}
- |
- {{section.SizeOfRawData}} |
- {{section.Entropy}} |
-
-
-
-
- -
- MD5
-
- -
- {{section.MD5}}
-
-
-
- -
- SHA1
-
- -
- {{section.SHA1}}
-
-
-
- -
- SHA256
-
- -
- {{section.SHA256}}
-
-
- |
-
-
-
-
-
-
-
-
-
-
- PE Import Address Table
-
-
-
- -
-
-
-
- {{entry.entryname}}
-
-
- -
-
- {{entry.symbols.length}}
- items
-
-
-
-
-
-
-
-
-
-
- Olevba Report
-
-
-
Summary
-
- - Olevba version:
- - v{{content.MSOffice.olevba.Version}}
-
-
-
- - Olevba detection :
- - {{content.MSOffice.olevba.vba}}
-
-
-
- - Olevba scanner :
- -
-
-
-
- Not suspicious
- Suspicious VBA
-
-
- Base64 strings
-
-
- Hex strings
-
-
-
-
- Not suspicious
-
-
-
-
-
-
-
-
Detailed Information
-
-
-
-
-
OLE stream:
- {{stream['OLE stream']}}
-
-
-
Information
-
- - VBA filename:
- - {{stream['VBA filename']}}
-
-
- - Filename:
- - {{stream['Filename']}}
-
-
-
-
Olevba analysis
-
-
-
-
- | Type |
- Keyword |
- Description |
-
-
-
-
- | {{result.type}} |
- {{result.keyword}} |
- {{result.description}} |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Analysis failure
-
-
- {{content.MSOffice.olevba.Error}}
-
-
-
-
-
-
-
-
-
-
-
-
- PDFiD Report
-
-
-
Summary
-
- - PDFiD version:
- - v{{content.PDF.pdfid[0].pdfid.version}}
-
-
-
- - Suspicious:
- - {{content.PDF.pdfid[0].suspicious}}
-
-
-
- - PDFiD detection :
- -
-
-
-
- /RichMedia
-
-
-
-
- /OpenAction
-
-
-
-
- /JavaScript
-
-
-
-
- /Launch
-
-
-
-
- /ObjStm
-
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- Detailed Information
-
-
-
- No records found
-
-
-
- | Source |
- First seen by source |
- Last seen by source |
- Category |
- Details |
-
-
- | {{source.source}} |
- {{source.first_seen || '-'}} |
- {{source.last_seen || '-'}} |
- {{source.category || '-'}} |
-
- First added in DB: {{source.firstAppearance }}
- Last added in DB: {{source.lastAppearance }} |
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- Detailed Information
-
-
-
- - Hippocamp Score:
- -
-
- {{score}}
-
-
- {{score}}
-
-
- {{score}}
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- Geolocation of {{(artifact.data || artifact.attachment.name) | fang}}
-
-
-
Is anonymous proxy
-
Is satellite provider
-
- {{[content.continent.name, content.country.name, content.subdivisions.name, content.city.name].join(' / ')}}
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- Email message details
-
-
-
Is anonymous proxy
-
Is satellite provider
-
-
- - From
- - {{content.displayFrom}} ({{content.sender}})
-
-
- - To
- - {{content.displayTo}} ({{content.receivers}})
-
-
- - Subject
- - {{content.subject || '-'}}
-
-
- - Topic
- - {{content.topic || '-'}}
-
-
- - Bcc
- - {{content.bcc || '-'}}
-
-
- - Attachments
- -
-
This message file includes
-
-
-
-
-
- | Filename |
- Mime Type |
- Extension |
-
-
-
-
- | {{a.filename}} |
- {{a.mime}} |
- {{a.extension}} |
-
-
-
-
-
-
- - Headers
- -
-
{{content.headers}}
-
-
-
- - Body
- -
-
{{content.body}}
-
-
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- OTX Report
-
-
-
-
- - ERROR:
- - {{content.errortext}}
-
-
-
- - Related Pulses Found:
- - {{content.pulse_count}}
-
-
-
- - Related Pulses:
- -
-
-
Name: {{::pulse.name}}
-
Author: {{::pulse.author.username}}
-
Modified: {{::pulse.modified_text}} @ {{::pulse.modified}}
-
Subscribers: {{::pulse.subscriber_count}}
-
Subscribed: {{::pulse.is_subscribing}}
-
Industries: {{::pulse.industries}}
-
Indicators: {{::pulse.indicator_count}}
-
-
-
-
-
- - Submit Pulse:
- -
- Create a Pulse
-
-
-
-
- - Malware Samples:
- -
-
- {{::sample.sample}}
-
-
-
-
-
- - Malware:
- - {{content.malware}}
-
-
-
- - SHA1:
- - {{content.sha1}}
-
-
-
- - SHA256:
- - {{content.sha256}}
-
-
-
- - MD5:
- - {{content.md5}}
-
-
-
- - Page Type:
- - {{content.page_type}}
-
-
-
- - File Class:
- - {{content.file_class}}
-
-
-
- - File Type:
- - {{content.file_type}}
-
-
-
- - File Size:
- - {{content.filesize}}
-
-
-
- - SSDEEP:
- - {{content.ssdeep}}
-
-
-
- - Related URLs:
- -
-
- URL: {{::url.url}}
- Date: {{::url.date}}
- HTTP Code: {{::url.httpcode}}
- IP: {{::url.result.urlworker.ip}}
-
-
-
-
-
-
- - Passive DNS:
- -
-
- Hostname: {{::dns.hostname}}
- IP: {{::dns.address}}
- First/Last seen: {{::dns.first}} / {{::dns.last}}
- Locale: {{::dns.flag_title}}
-
-
-
-
-
-
- - Whois:
- -
- Whois Query
-
-
-
-
- - Alexa:
- -
- Alexa Report
-
-
-
-
- - City:
- - {{content.city}}
-
-
-
- - Country Code:
- - {{content.country_code}}
-
-
-
- - Country:
- - {{content.country_name}}
-
-
-
- - ASN:
- - {{content.asn}}
-
-
-
-
-
-
-
-
-
- PassiveTotal Enrichment Info
-
-
-
- No records found
-
-
-
- - {{key}}
- -
-
-
- {{tag}}
-
-
- {{subd}}
-
-
- {{value || None}}
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
-
- PassiveTotal OSINT
-
-
-
- No records found
-
-
-
-
-
- - {{key}}:
- -
-
-
- {{value || None}}
-
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
-
- PassiveTotal OSINT
-
-
-
- No records found
-
-
-
-
-
- - {{key}}:
- -
-
-
- {{v}}
-
-
- {{v}}
-
-
- {{value || None}}
-
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
-
-
- PassiveTotal PassiveDNS Report
-
-
-
- No records found
-
-
-
- Summary Information
-
-
-
- - Value:
- - {{content.queryValue}}
-
-
- - Total Records:
- - {{content.totalRecords}}
-
-
- - First seen:
- - {{content.firstSeen}}
-
-
- - Last seen:
- - {{content.lastSeen}}
-
-
-
-
-
- Records
-
-
-
-
- | Source |
- Resolve |
- First seen |
- Last seen |
-
-
- |
-
- {{s}}
-
- |
- {{c.resolve || 'None'}} |
- {{c.firstSeen || 'None'}} |
- {{c.lastSeen || 'None'}} |
-
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
-
- PassiveTotal SSL Certificate Information
-
-
-
- No records found
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
-
- Detailed Information
-
-
-
- No records found
-
-
-
- | SHA1 |
- First seen |
- Last seen |
-
-
- | {{c.sha1}} |
- {{c.firstSeen || 'None'}} |
- {{c.lastSeen || 'None'}} |
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
- PassiveTotal unique resolution
-
-
-
- No records found
-
-
-
- - Query Type:
- - {{content.queryType}}
-
-
- - Query:
- - {{content.queryValue}}
-
-
- -
-
-
-
- {{content.queryValue}} :
- -
-
- {{content.total}} result(s)
-
-
-
- {{content.results[0]}}
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
-
- PassiveTotal Whois Summary
-
-
-
- No records found
-
-
-
- - Domain:
- - {{content.domain|| "-"}}
-
-
- - Contact email:
- - {{content.contactEmail || "-"}}
-
-
- - Nameservers:
- - {{ns}}
-
-
- - Whois server:
- - {{content.whoisServer || "-"}}
-
-
- - Registered date:
- - {{content.registered}}
-
-
- - Registry updated at:
- - {{content.registryUpdatedAt}}
-
-
- - Last load at:
- - {{content.lastLoadedAt}}
-
-
- - Expires at:
- - {{content.expiresAt}}
-
-
- - Registrar:
- - {{content.registrar}}
-
-
-
-
-
-
-
- PassiveTotal Whois Admin Info
-
-
-
- No records found
-
-
-
- - {{key}}
- - {{value}}
-
-
-
-
-
-
-
- PassiveTotal Whois Tech Info
-
-
-
- No records found
-
-
-
- - {{key}}
- - {{value}}
-
-
-
-
-
-
-
- PassiveTotal Whois Registrant Info
-
-
-
- No records found
-
-
-
- - {{key}}
- - {{value}}
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- PhishingInitiative Report for {{artifact.data | fang}}
-
-
-
- - Status:
- -
- {{content.tag_label}}
-
-
-
-
-
- {{artifact.data | fang}}
-
-
- {{content.errorMessage}}
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
- Summary
-
-
-
- - Score
- - {{content.positives || 0}}/{{content.total}}
-
-
- - Last analysis date
- - {{content.scan_date}}
-
-
- - Autonomous System
- - {{content.as_owner}}
-
-
- - Categories
- - {{content.categories.join(', ')}}
-
-
- - Sub domains
- - {{content.subdomains.join(', ')}}
-
-
- - Resolutions
- -
-
- This domain has been seen to resolve to the following IP addresses.
-
-
- The following domains resolved to the given IP address.
-
-
- {{::resolution.last_resolved | amDateFormat:'DD-MM-YYYY'}}:
- {{(resolution.ip_address | fang) || (resolution.hostname | fang)}}
-
-
-
-
- - Virus Total
- -
-
-
-
- View Full Report
-
-
-
-
- View Full Report
-
-
-
-
- View Full Report
-
-
-
-
-
-
-
-
-
-
Latest URLs hosted in this IP address
- detected by at least one URL scanner or malicious URL dataset.
-
-
-
- | Score |
- Scan Date |
- URL |
-
-
- |
- {{::url.positives}}/{{::url.total}}
- |
- {{url.scan_date}} |
- {{url.url | fang}} |
-
-
-
-
-
-
-
-
-
Latest files that are
- detected by at least one antivirus solution and were downloaded by VirusTotal from the IP address provided.
-
-
-
- | Score |
- Date |
- SHA256 |
-
-
- |
- {{hash.positives}}/{{hash.total}}
- |
- {{hash.date}} |
- {{hash.sha256}} |
-
-
-
-
-
-
-
-
-
Latest files that are
- detected by at least one antivirus solution and embed URL pattern strings with the IP address provided.
-
-
-
- | Score |
- SHA256 |
-
-
- |
- {{hash.positives}}/{{hash.total}}
- |
- {{hash.sha256}} |
-
-
-
-
-
-
-
- Scans
-
-
-
-
-
- | Scanner |
- Detected |
- Result |
- Details |
- Update |
- Version |
-
-
- |
- {{scanner}}
- |
-
-
- |
- {{result.result}} |
-
-
-
- View details
- |
- {{result.update}} |
- {{result.version}} |
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.verbose_msg}}
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name) | fang}}
-
-
- {{content.errorMessage}}
-
-
-
-
-
Summary
-
-
- - Score
- - {{content.positives}}/{{content.total}}
-
-
- - Last analysis date
- - {{content.scan_date}}
-
-
- - Virus Total
- -
-
-
-
- View Full Report
-
-
-
-
-
-
-
-
Scans
-
-
-
-
- | Scanner |
- Detected |
- Result |
- Details |
- Update |
- Version |
-
-
- | {{scanner}} |
-
-
- |
- {{result.result}} |
-
- View details
- |
- {{result.update}} |
- {{result.version}} |
-
-
-
-
-
-
-
-
-
-
- {{(artifact.data || artifact.attachment.name)| fang}}
-
-
- {{content.verbose_msg}}
-
-
-
-
- |
+ |
+ |
|
Type |
Data |
@@ -38,6 +39,7 @@
offset: (pagination.currentPage-1)*pagination.pageSize |
limitTo: pagination.pageSize ">
|
+ |
|
diff --git a/ui/app/views/login.html b/ui/app/views/login.html
index 18bc6d7729..7b42eede7c 100644
--- a/ui/app/views/login.html
+++ b/ui/app/views/login.html
@@ -22,10 +22,10 @@
-
-
-
-
+
OR
+
+
diff --git a/ui/app/views/partials/admin/case-template/tasks.html b/ui/app/views/partials/admin/case-template/tasks.html
index a09eae453c..e60f16559b 100644
--- a/ui/app/views/partials/admin/case-template/tasks.html
+++ b/ui/app/views/partials/admin/case-template/tasks.html
@@ -7,7 +7,7 @@
- No tasks have been specified.
+ No tasks have been specified.
Add a task
diff --git a/ui/bower.json b/ui/bower.json
index baf64fcae5..4da35f6d5b 100644
--- a/ui/bower.json
+++ b/ui/bower.json
@@ -1,6 +1,6 @@
{
"name": "thehive",
- "version": "3.4.2",
+ "version": "3.5.0-RC1",
"license": "AGPL-3.0",
"dependencies": {
"jquery": "^3.4.1",
diff --git a/ui/package.json b/ui/package.json
index 4203f746c1..43d762078a 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "thehive",
- "version": "3.4.2",
+ "version": "3.5.0-RC1",
"license": "AGPL-3.0",
"repository": {
"type": "git",
diff --git a/version.sbt b/version.sbt
index 06daa17521..95b3e51d97 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.4.2-1"
+version in ThisBuild := "3.5.0-RC1-1"