Revert "ing"

This reverts commit f265cbad85
This commit is contained in:
Administrator 2018-09-13 07:30:45 +00:00
parent f265cbad85
commit 7e4a2f1775
25 changed files with 0 additions and 375 deletions

View File

@ -181,22 +181,6 @@ func (m *ActiveDirectoryMatcher) Type() string {
return "DIRECTORY"
}
func (m *ActiveDirectoryMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "MicroSoft"
}
func (m *ActiveDirectoryMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *ActiveDirectoryMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *ActiveDirectoryMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *ActiveDirectoryMatcher) Name(matchCtx *osm.MatchCtx) string {
return "ActiveDirectory"
}

View File

@ -27,22 +27,6 @@ func (m *CassandraMatcher) Type() string {
return "NOSQL"
}
func (m *CassandraMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "The Apache Software Foundation"
}
func (m *CassandraMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *CassandraMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *CassandraMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *CassandraMatcher) Name(matchCtx *osm.MatchCtx) string {
return "Cassandra"
}

View File

@ -48,21 +48,6 @@ func (m *DNSMatcher) Key() string {
func (m *DNSMatcher) Type() string {
return "NETWORK"
}
func (m *DNSMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *DNSMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *DNSMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *DNSMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *DNSMatcher) Name(matchCtx *osm.MatchCtx) string {
return "DNS"

View File

@ -20,21 +20,6 @@ func (m *ElasticSearchMatcher) Key() string {
func (m *ElasticSearchMatcher) Type() string {
return "SEARCH"
}
func (m *ElasticSearchMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "Elasticsearch"
}
func (m *ElasticSearchMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *ElasticSearchMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *ElasticSearchMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *ElasticSearchMatcher) Name(matchCtx *osm.MatchCtx) string {
name := "ElasticSearch"

View File

@ -36,21 +36,6 @@ func (m *FTPMatcher) Key() string {
func (m *FTPMatcher) Type() string {
return "NETWORK"
}
func (m *FTPMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *FTPMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *FTPMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *FTPMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *FTPMatcher) Name(matchCtx *osm.MatchCtx) string {
return "FTP"

View File

@ -18,22 +18,6 @@ func (m *HTTPMatcher) Type() string {
return "WEB"
}
func (m *HTTPMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *HTTPMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *HTTPMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *HTTPMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *HTTPMatcher) Name(matchCtx *osm.MatchCtx) string {
name := "HTTP"
if v, ok := matchCtx.GetAttribute("server"); ok {

View File

@ -20,21 +20,6 @@ func (m *IMAPMatcher) Key() string {
func (m *IMAPMatcher) Type() string {
return "MAIL"
}
func (m *IMAPMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *IMAPMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *IMAPMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *IMAPMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *IMAPMatcher) Name(matchCtx *osm.MatchCtx) string {
return "IMAP"

View File

@ -25,21 +25,6 @@ func (m *LDAPMatcher) Key() string {
func (m *LDAPMatcher) Type() string {
return "DIRECTORY"
}
func (m *LDAPMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LDAPMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LDAPMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LDAPMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LDAPMatcher) Name(matchCtx *osm.MatchCtx) string {
return "LDAP"

View File

@ -16,22 +16,6 @@ func (m *LPDMatcher) Type() string {
return "NETWORK"
}
func (m *LPDMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LPDMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LPDMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LPDMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *LPDMatcher) Name(matchCtx *osm.MatchCtx) string {
return "LPD (Printer)"
}

View File

@ -7,10 +7,6 @@ import (
type Matcher interface {
Key() string
Type() string
Vendor(matchCtx *MatchCtx) string
Version(matchCtx *MatchCtx) string
OsType(matchCtx *MatchCtx) string
OsVersion(matchCtx *MatchCtx) string
Name(matchCtx *MatchCtx) string
IsPrePacket() bool

View File

@ -58,22 +58,6 @@ func (m *MongoDBMatcher) Type() string {
return "NOSQL"
}
func (m *MongoDBMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "MongoDB"
}
func (m *MongoDBMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *MongoDBMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *MongoDBMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *MongoDBMatcher) Name(matchCtx *osm.MatchCtx) string {
return "MongoDB"
}

View File

@ -21,22 +21,6 @@ func (m *MySqlMatcher) Type() string {
return "DATABASE"
}
func (m *MySqlMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "Oracle"
}
func (m *MySqlMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *MySqlMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *MySqlMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *MySqlMatcher) Name(matchCtx *osm.MatchCtx) string {
name := "MySQL"
if v, ok := matchCtx.GetAttribute("version"); ok {

View File

@ -36,21 +36,6 @@ func (m *NBSSMatcher) Key() string {
func (m *NBSSMatcher) Type() string {
return "NETWORK"
}
func (m *NBSSMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *NBSSMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *NBSSMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *NBSSMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *NBSSMatcher) Name(matchCtx *osm.MatchCtx) string {
return "NBSS"

View File

@ -18,21 +18,6 @@ func (m *OracleMatcher) Key() string {
func (m *OracleMatcher) Type() string {
return "DATABASE"
}
func (m *OracleMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "Oracle"
}
func (m *OracleMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *OracleMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *OracleMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *OracleMatcher) Name(matchCtx *osm.MatchCtx) string {
return "Oracle"

View File

@ -19,21 +19,6 @@ func (m *POPMatcher) Key() string {
func (m *POPMatcher) Type() string {
return "MAIL"
}
func (m *POPMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *POPMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *POPMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *POPMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *POPMatcher) Name(matchCtx *osm.MatchCtx) string {
return "POP3"

View File

@ -48,21 +48,6 @@ func (m *PostgreSQLMatcher) Key() string {
func (m *PostgreSQLMatcher) Type() string {
return "DATABASE"
}
func (m *PostgreSQLMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "PostgreSQL"
}
func (m *PostgreSQLMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *PostgreSQLMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *PostgreSQLMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *PostgreSQLMatcher) Name(matchCtx *osm.MatchCtx) string {
return "PostgreSQL"

View File

@ -24,22 +24,6 @@ func (m *RedisMatcher) Type() string {
return "NOSQL"
}
func (m *RedisMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "Redis"
}
func (m *RedisMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RedisMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RedisMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RedisMatcher) Name(matchCtx *osm.MatchCtx) string {
name := "Redis"

View File

@ -39,22 +39,6 @@ func (m *RMIMatcher) Type() string {
return "NETWORK"
}
func (m *RMIMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RMIMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RMIMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RMIMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *RMIMatcher) Name(matchCtx *osm.MatchCtx) string {
return "RMI"
}

View File

@ -60,22 +60,6 @@ func (m *SMBMatcher) Type() string {
return "NETWORK"
}
func (m *SMBMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SMBMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SMBMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SMBMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SMBMatcher) Name(matchCtx *osm.MatchCtx) string {
return "SMB"
}

View File

@ -17,21 +17,6 @@ func (m *SmtpMatcher) Key() string {
func (m *SmtpMatcher) Type() string {
return "MAIL"
}
func (m *SmtpMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SmtpMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SmtpMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SmtpMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SmtpMatcher) Name(matchCtx *osm.MatchCtx) string {
return "SMTP"

View File

@ -51,22 +51,6 @@ func (m *SNMPMatcher) Type() string {
return "MONITORING"
}
func (m *SNMPMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SNMPMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SNMPMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SNMPMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (s *SNMPMatcher) Name(matchCtx *osm.MatchCtx) string {
return "SNMP"
}

View File

@ -76,21 +76,6 @@ func (m *SQLServerMatcher) Key() string {
func (m *SQLServerMatcher) Type() string {
return "DATABASE"
}
func (m *SQLServerMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "MicroSoft"
}
func (m *SQLServerMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SQLServerMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SQLServerMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SQLServerMatcher) Name(matchCtx *osm.MatchCtx) string {
if m.isSSL {

View File

@ -20,22 +20,6 @@ func (m *SSHMatcher) Type() string {
return "NETWORK"
}
func (m *SSHMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SSHMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SSHMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SSHMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *SSHMatcher) Name(matchCtx *osm.MatchCtx) string {
name := "SSH"
if v, ok := matchCtx.GetAttribute("softwareversion"); ok {

View File

@ -23,21 +23,6 @@ func (m *TelnetMatcher) Key() string {
func (m *TelnetMatcher) Type() string {
return "NETWORK"
}
func (m *TelnetMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *TelnetMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *TelnetMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *TelnetMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *TelnetMatcher) Name(matchCtx *osm.MatchCtx) string {
return "Telnet"

View File

@ -28,21 +28,6 @@ func (m *WMIMatcher) Key() string {
func (m *WMIMatcher) Type() string {
return "MONITORING"
}
func (m *WMIMatcher) Vendor(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *WMIMatcher) Version(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *WMIMatcher) OsType(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *WMIMatcher) OsVersion(matchCtx *osm.MatchCtx) string {
return "UNKNOWN"
}
func (m *WMIMatcher) Name(matchCtx *osm.MatchCtx) string {
return "WMI"