mirror of
https://github.com/activecm/rita
synced 2026-06-08 13:02:45 +00:00
b923c39e2d
* Update on config structure, functionality, and tests Co-Authored-By: Naomi Kramer <naomiagoddard@gmail.com> * Extend subnet type to read/write from db, update tests Co-Authored-By: Liza Tsibur <liza@activecountermeasures.com> * updated read file config test and subnet tests * fixed config and util tests, updated subnet related functions Co-Authored-By: Naomi Kramer <naomiagoddard@gmail.com> * Remove error return from GetDefaultConfig Co-Authored-By: Liza Tsibur <liza@activecountermeasures.com> * added json tags to database struct * Updated beacon weights validation for config * updates to score thresholds validation tags * changes to config subnet validation and testing * Update subnet.go * Write missing host entries to http to populate http_proto * Updating some fields to uint64 * WIP update some field types * Update zeek count types and fix tests * Add clickhouse credentials * Misc fixes * Update pointer * Add ability to mark datasets as sample datasets * fix column name * Fix datasets exiting import if hour is empty * Fix zeek count parsing from TSV files * Remove storing dns conns in arrays, Fix historical first seen dns lag * Remove unused columns * Update config.hjson * Update config.hjson * updated impact category score functions to use float64 Co-Authored-By: Naomi Kramer <naomiagoddard@gmail.com> * Update subnet.go * Store import version in imports table * Fix duplicated SNI/IP long connections * Update subnet_test.go * Cleanup output * Rolling files updates (#39) * Limit number of days to import for rolling datasets * Fix breaking imports when import was interrupted * Remove debug output --------- Co-authored-by: Naomi Kramer <naomi@activecountermeasures.com> * Omit parts of env from output * Set max for threat intel datasize * Remove SELinux neutering for QA * Add network size column * Fix http_proto for missing host, update tests for missing host fixes * Add online feeds to default config * Update sshprep (#45) * Update sshprep Co-Authored-By: William Stearns <3538265+william-stearns@users.noreply.github.com> * Update sshprep Add Bradley's suggestion of using head -1 to limit to a single address. --------- Co-authored-by: Naomi Kramer <naomi@activecountermeasures.com> Co-authored-by: William Stearns <3538265+william-stearns@users.noreply.github.com> * Installer Behavior Tweaks (#41) * Add --yes flag to add-apt-repository command * Add missing sudo flags, make sure we're using the SUDO variable instead * Add ability to perform zone transfers (#48) * Store zone transfer records Co-Authored-By: moth <25512187+0x6d6f7468@users.noreply.github.com> * Update config * Add tests * Tests, connectivity test * Update tests --------- Co-authored-by: moth <25512187+0x6d6f7468@users.noreply.github.com> * Support RedHat/RHEL as a valid target (#47) * Update sshprep Co-Authored-By: William Stearns <3538265+william-stearns@users.noreply.github.com> * Supporrt RedHat/RHEL as a valid target --------- Co-authored-by: Naomi Kramer <naomi@activecountermeasures.com> Co-authored-by: William Stearns <3538265+william-stearns@users.noreply.github.com> Co-authored-by: moth <moth@blackhillsinfosec.com> * Fix tests (#49) * Fix tests * Update WalkFiles to use UTC * fixed issue with rolling datasets over 24hours old not getting historical first seen timestamp set (#52) * Change values from float32 to float64 (#50) * Switch float32 to float64 * Update threat category calculation to match CalculateBucketedScore (#51) --------- Co-authored-by: Liza Tsibur <liza@activecountermeasures.com> * Bump max query execution time default value * Use string instead of error for ZoneTransferConnectivityErrors struct fields (#61) * Upgrade Golang to version 1.24 (#59) (#60) * Replace get_url with shell and curl (#58) * Update sshprep Co-Authored-By: William Stearns <3538265+william-stearns@users.noreply.github.com> * Replace get_url with shell and curl * Use get_url by default, fall back to curl if it fails --------- Co-authored-by: Naomi Kramer <naomi@activecountermeasures.com> Co-authored-by: William Stearns <3538265+william-stearns@users.noreply.github.com> Co-authored-by: moth <moth@blackhillsinfosec.com> * add automated log transfer, AC-Hunter issue 135 (#62) * Update sshprep Co-Authored-By: William Stearns <3538265+william-stearns@users.noreply.github.com> * add automated log transfer, PR135 * cron requires non-executable permission * Specify suggested YAML plugin and config in VSCode workspace * Linting and light cleanup * Update generate_installer.sh Download zeek_log_transport.sh to send to the sensor. * Create cron file if remote zeek installation * Only run zeek log import steps for remote sensor installations --------- Co-authored-by: Naomi Kramer <naomi@activecountermeasures.com> Co-authored-by: William Stearns <3538265+william-stearns@users.noreply.github.com> Co-authored-by: moth <moth@blackhillsinfosec.com> * Temporarily disable RITA/Zeek log transport until installer is modular (#66) * Uniform -y flag usage for repo management/package installation; Uniform SUDO variable usage (#68) * Resolve Installer Side Effects and Formalize RHEL Support (#73) * Add missing necessary wildcards for RHEL versions * Remove Ansible task replacing python3-requests to avoid RHEL distro installation side effects * Update supported distros in README * Update scoring defaults * Resolve Ansible Reboot Errors (#75) * Clean up conditionals; Fix reboot step for Ubuntu * Suppress erroneous error output on RPM systems, ignore errors on reboot necessity checks * Ignore missing host rows for openhttp (#76) * Fix integration tests due to prevalence (#77) --------- Co-authored-by: Liza Tsibur <liza@activecountermeasures.com> Co-authored-by: moth <moth@blackhillsinfosec.com> Co-authored-by: William Stearns <william.l.stearns@gmail.com> Co-authored-by: William Stearns <3538265+william-stearns@users.noreply.github.com> Co-authored-by: moth <25512187+0x6d6f7468@users.noreply.github.com>
259 lines
8.3 KiB
Go
259 lines
8.3 KiB
Go
package importer
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"log"
|
|
"net"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/activecm/rita/v5/config"
|
|
"github.com/activecm/rita/v5/database"
|
|
"github.com/activecm/rita/v5/importer/zeektypes"
|
|
zlog "github.com/activecm/rita/v5/logger"
|
|
"github.com/activecm/rita/v5/progressbar"
|
|
"github.com/activecm/rita/v5/util"
|
|
|
|
"github.com/ClickHouse/clickhouse-go/v2"
|
|
tea "github.com/charmbracelet/bubbletea"
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
var errServerNameEmpty = errors.New("server name is blank")
|
|
|
|
type SSLEntry struct {
|
|
ImportTime time.Time `ch:"import_time"`
|
|
ZeekUID util.FixedString `ch:"zeek_uid"`
|
|
Hash util.FixedString `ch:"hash"`
|
|
Timestamp time.Time `ch:"ts"`
|
|
Src net.IP `ch:"src"`
|
|
Dst net.IP `ch:"dst"`
|
|
SrcNUID uuid.UUID `ch:"src_nuid"`
|
|
DstNUID uuid.UUID `ch:"dst_nuid"`
|
|
SrcPort uint32 `ch:"src_port"`
|
|
DstPort uint32 `ch:"dst_port"`
|
|
Duration float64 `ch:"duration"`
|
|
SrcLocal bool `ch:"src_local"`
|
|
DstLocal bool `ch:"dst_local"`
|
|
SrcBytes uint64 `ch:"src_bytes"`
|
|
DstBytes uint64 `ch:"dst_bytes"`
|
|
SrcIPBytes uint64 `ch:"src_ip_bytes"`
|
|
DstIPBytes uint64 `ch:"dst_ip_bytes"`
|
|
SrcPackets uint64 `ch:"src_packets"`
|
|
DstPackets uint64 `ch:"dst_packets"`
|
|
Proto string `ch:"proto"`
|
|
Service string `ch:"service"`
|
|
ConnState string `ch:"conn_state"`
|
|
Version string `ch:"version"`
|
|
Cipher string `ch:"cipher"`
|
|
Curve string `ch:"curve"`
|
|
ServerName string `ch:"server_name"`
|
|
Resumed bool `ch:"resumed"`
|
|
NextProtocol string `ch:"next_protocol"`
|
|
Established bool `ch:"established"`
|
|
ServerCertFUIDs []string `ch:"server_cert_fuids"`
|
|
ClientCertFUIDs []string `ch:"client_cert_fuids"`
|
|
ServerSubject string `ch:"server_subject"`
|
|
ServerIssuer string `ch:"server_issuer"`
|
|
ClientSubject string `ch:"client_subject"`
|
|
ClientIssuer string `ch:"client_issuer"`
|
|
ValidationStatus string `ch:"validation_status"`
|
|
JA3 string `ch:"ja3"`
|
|
JA3S string `ch:"ja3s"`
|
|
}
|
|
|
|
// parseSSL listens on a channel of raw ssl/openssl log records, formats them and sends them to be linked with conn/openconn records and written to the database
|
|
func parseSSL(cfg *config.Config, ssl <-chan zeektypes.SSL, output chan database.Data, importTime time.Time, numSSL *uint64) {
|
|
logger := zlog.GetLogger()
|
|
|
|
// loop over raw ssl/openssl channel
|
|
for s := range ssl {
|
|
|
|
// parse raw record record as an ssl/openssl entry
|
|
entry, err := formatSSLRecord(cfg, &s, importTime)
|
|
if err != nil {
|
|
logger.Debug().Err(err).
|
|
Str("log_path", s.LogPath).
|
|
Str("zeek_uid", s.UID).
|
|
Str("timestamp", (time.Unix(int64(s.TimeStamp), 0)).String()).
|
|
Str("src", s.Source).
|
|
Str("dst", s.Destination).
|
|
Str("sni", s.ServerName).
|
|
Send()
|
|
continue
|
|
}
|
|
|
|
// entry was subject to filtering
|
|
if entry == nil {
|
|
continue
|
|
}
|
|
|
|
output <- entry
|
|
// increment record counter
|
|
atomic.AddUint64(numSSL, 1)
|
|
}
|
|
}
|
|
|
|
// formatSSLRecord takes a raw ssl record and formats it into the structure needed by the database
|
|
func formatSSLRecord(cfg *config.Config, parseSSL *zeektypes.SSL, importTime time.Time) (*SSLEntry, error) {
|
|
|
|
// get source destination pair
|
|
src := parseSSL.Source
|
|
dst := parseSSL.Destination
|
|
|
|
// parse source and destination
|
|
srcIP := net.ParseIP(src)
|
|
dstIP := net.ParseIP(dst)
|
|
|
|
// verify that both addresses were parsed successfully
|
|
if (srcIP == nil) || (dstIP == nil) {
|
|
return nil, errors.New(errParseSrcDst)
|
|
}
|
|
|
|
// get sni
|
|
sni := parseSSL.ServerName
|
|
|
|
if sni == "" {
|
|
return nil, fmt.Errorf("could not parse SSL connection %s -> %s: %w", src, dst, errServerNameEmpty)
|
|
}
|
|
|
|
ignore := cfg.Filtering.FilterDomain(sni) || cfg.Filtering.FilterConnPair(srcIP, dstIP) || cfg.Filtering.FilterSNIPair(srcIP)
|
|
if ignore {
|
|
return nil, nil
|
|
}
|
|
|
|
srcNUID := util.ParseNetworkID(srcIP, parseSSL.AgentUUID)
|
|
dstNUID := util.ParseNetworkID(dstIP, parseSSL.AgentUUID)
|
|
|
|
zeekUID, err := util.NewFixedStringHash(parseSSL.UID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
hash, err := util.NewFixedStringHash(srcIP.To16().String(), srcNUID.String(), dstIP.To16().String(), dstNUID.String(), sni)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
entry := &SSLEntry{
|
|
ImportTime: importTime,
|
|
ZeekUID: zeekUID,
|
|
Hash: hash,
|
|
Timestamp: time.Unix(int64(parseSSL.TimeStamp), 0),
|
|
Src: srcIP,
|
|
Dst: dstIP,
|
|
SrcNUID: srcNUID,
|
|
DstNUID: dstNUID,
|
|
SrcPort: parseSSL.SourcePort,
|
|
DstPort: parseSSL.DestinationPort,
|
|
SrcLocal: cfg.Filtering.CheckIfInternal(srcIP),
|
|
DstLocal: cfg.Filtering.CheckIfInternal(dstIP),
|
|
Version: parseSSL.Version,
|
|
Cipher: parseSSL.Cipher,
|
|
Curve: parseSSL.Curve,
|
|
ServerName: parseSSL.ServerName,
|
|
Resumed: parseSSL.Resumed,
|
|
NextProtocol: parseSSL.NextProtocol,
|
|
Established: parseSSL.Established,
|
|
ServerCertFUIDs: parseSSL.CertChainFuids,
|
|
ClientCertFUIDs: parseSSL.ClientCertChainFuids,
|
|
ServerSubject: parseSSL.Subject,
|
|
ServerIssuer: parseSSL.Issuer,
|
|
ClientSubject: parseSSL.ClientSubject,
|
|
ClientIssuer: parseSSL.ClientIssuer,
|
|
ValidationStatus: parseSSL.ValidationStatus,
|
|
JA3: parseSSL.JA3,
|
|
JA3S: parseSSL.JA3S,
|
|
}
|
|
|
|
return entry, nil
|
|
}
|
|
|
|
func (importer *Importer) writeLinkedSSL(ctx context.Context, progress *tea.Program, barID int, sslWriter *database.BulkWriter, open bool) error {
|
|
logger := zlog.GetLogger()
|
|
|
|
var totalSSL uint64
|
|
err := importer.Database.Conn.QueryRow(importer.Database.GetContext(), `
|
|
SELECT count() FROM ssl_tmp
|
|
`).Scan(&totalSSL)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
tmpTable := "ssl_tmp"
|
|
tableB := "conn_tmp"
|
|
if open {
|
|
tmpTable = "openssl_tmp"
|
|
tableB = "openconn_tmp"
|
|
}
|
|
|
|
chCtx := importer.Database.QueryParameters(clickhouse.Parameters{
|
|
"tmp_table": tmpTable,
|
|
"table_b": tableB,
|
|
})
|
|
|
|
rows, err := importer.Database.Conn.Query(chCtx, `
|
|
SELECT
|
|
s.zeek_uid as zeek_uid, c.ts AS ts, s.src as src, s.src_nuid as src_nuid, s.dst as dst, s.dst_nuid as dst_nuid,
|
|
s.src_port as src_port, s.dst_port as dst_port, s.src_local as src_local, s.dst_local as dst_local, server_name as server_name,
|
|
s.version as version, s.cipher as cipher, s.curve as curve, s.resumed as resumed, s.next_protocol as next_protocol, s.established as established,
|
|
s.server_cert_fuids as server_cert_fuids, client_cert_fuids, server_subject, server_issuer, client_subject, client_issuer, validation_status,
|
|
ja3, ja3s,
|
|
-- set proto and service regardless of whether it was linked already or not
|
|
-- since multi-requests can use different dst ports and still have the same UID, so
|
|
-- it is useful to be able to see the dst ports coming from multi request entries as well
|
|
c.proto as proto, c.service as service,
|
|
c.src_ip_bytes as src_ip_bytes,
|
|
c.dst_ip_bytes as dst_ip_bytes,
|
|
c.src_bytes as src_bytes,
|
|
c.dst_bytes as dst_bytes,
|
|
c.duration as duration,
|
|
c.conn_state as conn_state,
|
|
c.src_packets as src_packets,
|
|
c.dst_packets as dst_packets
|
|
FROM {tmp_table:Identifier} s
|
|
INNER JOIN {table_b:Identifier} c USING zeek_uid
|
|
|
|
`)
|
|
if err != nil {
|
|
log.Panicln(err)
|
|
}
|
|
|
|
i := 0
|
|
for rows.Next() {
|
|
select {
|
|
// abort this function if the context was cancelled
|
|
case <-ctx.Done():
|
|
logger.Warn().Msg("cancelling SSL connection linking")
|
|
rows.Close()
|
|
return ctx.Err()
|
|
default:
|
|
var entry SSLEntry
|
|
|
|
err := rows.ScanStruct(&entry)
|
|
if err != nil {
|
|
log.Panicln(err)
|
|
}
|
|
i++
|
|
if i%1000 == 0 {
|
|
progress.Send(progressbar.ProgressMsg{ID: barID, Percent: float64(float64(i) / float64(totalSSL))})
|
|
}
|
|
entry.ImportTime = importer.Database.ImportStartedAt
|
|
|
|
hash, err := util.NewFixedStringHash(entry.Src.To16().String(), entry.SrcNUID.String(), entry.ServerName)
|
|
if err != nil {
|
|
log.Panicln(err)
|
|
}
|
|
|
|
entry.Hash = hash
|
|
sslWriter.WriteChannel <- &entry
|
|
}
|
|
}
|
|
rows.Close()
|
|
progress.Send(progressbar.ProgressMsg{ID: barID, Percent: 1})
|
|
|
|
return nil
|
|
}
|