diff --git a/intel/entity.go b/intel/entity.go index 20bfe7f6..8c152fd9 100644 --- a/intel/entity.go +++ b/intel/entity.go @@ -83,7 +83,7 @@ func (e *Entity) reverseResolve() { return } // TODO: security level - domain, err := reverseResolver(context.TODO(), e.IP.String(), status.SecurityLevelDynamic) + domain, err := reverseResolver(context.TODO(), e.IP.String(), status.SecurityLevelNormal) if err != nil { log.Warningf("intel: failed to resolve IP %s: %s", e.IP, err) return diff --git a/status/const.go b/status/const.go index db12ed68..3d2deb9d 100644 --- a/status/const.go +++ b/status/const.go @@ -4,14 +4,14 @@ package status const ( SecurityLevelOff uint8 = 0 - SecurityLevelDynamic uint8 = 1 - SecurityLevelSecure uint8 = 2 - SecurityLevelFortress uint8 = 4 + SecurityLevelNormal uint8 = 1 + SecurityLevelHigh uint8 = 2 + SecurityLevelExtreme uint8 = 4 - SecurityLevelsDynamicAndSecure uint8 = SecurityLevelDynamic | SecurityLevelSecure - SecurityLevelsDynamicAndFortress uint8 = SecurityLevelDynamic | SecurityLevelFortress - SecurityLevelsSecureAndFortress uint8 = SecurityLevelSecure | SecurityLevelFortress - SecurityLevelsAll uint8 = SecurityLevelDynamic | SecurityLevelSecure | SecurityLevelFortress + SecurityLevelsNormalAndHigh uint8 = SecurityLevelNormal | SecurityLevelHigh + SecurityLevelsNormalAndExtreme uint8 = SecurityLevelNormal | SecurityLevelExtreme + SecurityLevelsHighAndExtreme uint8 = SecurityLevelHigh | SecurityLevelExtreme + SecurityLevelsAll uint8 = SecurityLevelNormal | SecurityLevelHigh | SecurityLevelExtreme StatusOff uint8 = 0 StatusError uint8 = 1 diff --git a/status/set.go b/status/set.go index ac32e781..036995d4 100644 --- a/status/set.go +++ b/status/set.go @@ -18,9 +18,9 @@ func (s *SystemStatus) autopilot() { // update active security level switch s.ThreatMitigationLevel { case SecurityLevelOff: - s.ActiveSecurityLevel = SecurityLevelDynamic - atomicUpdateActiveSecurityLevel(SecurityLevelDynamic) - case SecurityLevelDynamic, SecurityLevelSecure, SecurityLevelFortress: + s.ActiveSecurityLevel = SecurityLevelNormal + atomicUpdateActiveSecurityLevel(SecurityLevelNormal) + case SecurityLevelNormal, SecurityLevelHigh, SecurityLevelExtreme: s.ActiveSecurityLevel = s.ThreatMitigationLevel atomicUpdateActiveSecurityLevel(s.ThreatMitigationLevel) default: @@ -31,7 +31,7 @@ func (s *SystemStatus) autopilot() { // setSelectedSecurityLevel sets the selected security level. func setSelectedSecurityLevel(level uint8) { switch level { - case SecurityLevelOff, SecurityLevelDynamic, SecurityLevelSecure, SecurityLevelFortress: + case SecurityLevelOff, SecurityLevelNormal, SecurityLevelHigh, SecurityLevelExtreme: status.Lock() defer status.Unlock() diff --git a/status/status.go b/status/status.go index 38b4633e..f25981e5 100644 --- a/status/status.go +++ b/status/status.go @@ -87,20 +87,20 @@ func FmtSecurityLevel(level uint8) string { switch level { case SecurityLevelOff: return "Off" - case SecurityLevelDynamic: - return "Dynamic" - case SecurityLevelSecure: - return "Secure" - case SecurityLevelFortress: - return "Fortress" - case SecurityLevelsDynamicAndSecure: - return "Dynamic and Secure" - case SecurityLevelsDynamicAndFortress: - return "Dynamic and Fortress" - case SecurityLevelsSecureAndFortress: - return "Secure and Fortress" + case SecurityLevelNormal: + return "Normal" + case SecurityLevelHigh: + return "High" + case SecurityLevelExtreme: + return "Extreme" + case SecurityLevelsNormalAndHigh: + return "Normal and High" + case SecurityLevelsNormalAndExtreme: + return "Normal and Extreme" + case SecurityLevelsHighAndExtreme: + return "High and Extreme" case SecurityLevelsAll: - return "Dynamic, Secure and Fortress" + return "Normal, High and Extreme" default: return "INVALID" } diff --git a/status/status_test.go b/status/status_test.go index b08eb664..818b5801 100644 --- a/status/status_test.go +++ b/status/status_test.go @@ -5,29 +5,29 @@ import "testing" func TestStatus(t *testing.T) { setSelectedSecurityLevel(SecurityLevelOff) - if FmtActiveSecurityLevel() != "Dynamic" { + if FmtActiveSecurityLevel() != "Normal" { t.Errorf("unexpected string representation: %s", FmtActiveSecurityLevel()) } - setSelectedSecurityLevel(SecurityLevelDynamic) - AddOrUpdateThreat(&Threat{MitigationLevel: SecurityLevelSecure}) - if FmtActiveSecurityLevel() != "Dynamic*" { + setSelectedSecurityLevel(SecurityLevelNormal) + AddOrUpdateThreat(&Threat{MitigationLevel: SecurityLevelHigh}) + if FmtActiveSecurityLevel() != "Normal*" { t.Errorf("unexpected string representation: %s", FmtActiveSecurityLevel()) } - setSelectedSecurityLevel(SecurityLevelSecure) - if FmtActiveSecurityLevel() != "Secure" { + setSelectedSecurityLevel(SecurityLevelHigh) + if FmtActiveSecurityLevel() != "High" { t.Errorf("unexpected string representation: %s", FmtActiveSecurityLevel()) } - setSelectedSecurityLevel(SecurityLevelSecure) - AddOrUpdateThreat(&Threat{MitigationLevel: SecurityLevelFortress}) - if FmtActiveSecurityLevel() != "Secure*" { + setSelectedSecurityLevel(SecurityLevelHigh) + AddOrUpdateThreat(&Threat{MitigationLevel: SecurityLevelExtreme}) + if FmtActiveSecurityLevel() != "High*" { t.Errorf("unexpected string representation: %s", FmtActiveSecurityLevel()) } - setSelectedSecurityLevel(SecurityLevelFortress) - if FmtActiveSecurityLevel() != "Fortress" { + setSelectedSecurityLevel(SecurityLevelExtreme) + if FmtActiveSecurityLevel() != "Extreme" { t.Errorf("unexpected string representation: %s", FmtActiveSecurityLevel()) } diff --git a/status/threat.go b/status/threat.go index e6462895..e22173c3 100644 --- a/status/threat.go +++ b/status/threat.go @@ -61,7 +61,7 @@ func (s *SystemStatus) updateThreatMitigationLevel() { var mitigationLevel uint8 for _, threat := range s.Threats { switch threat.MitigationLevel { - case SecurityLevelDynamic, SecurityLevelSecure, SecurityLevelFortress: + case SecurityLevelNormal, SecurityLevelHigh, SecurityLevelExtreme: if threat.MitigationLevel > mitigationLevel { mitigationLevel = threat.MitigationLevel }