Merge fa89233 into 34df488

cloudtrust · Oct 17, 2019 · f436d4b · f436d4b
2 parents 34df488 + fa89233
commit f436d4b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/pkg/event/component.go b/pkg/event/component.go
@@ -174,8 +174,14 @@ func addCTtypeToEvent(event map[string]string) map[string]string {
 		return event
 
 	case "LOGIN_ERROR":
-		//LOGON_ERROR
-		event[database.CtEventType] = "LOGON_ERROR"
+		if f["error"] == "user_temporarily_disabled" {
+			//TEMPORARILY_LOCKED
+			event[database.CtEventType] = "TEMPORARILY_LOCKED"
+		} else {
+			//LOGON_ERROR
+			event[database.CtEventType] = "LOGON_ERROR"
+		}
+
 		return event
 	case "LOGOUT":
 		//LOGOUT

diff --git a/pkg/event/component_test.go b/pkg/event/component_test.go
@@ -267,6 +267,46 @@ func TestEventToMapLogonError(t *testing.T) {
 
 }
 
+func TestEventToMapLogonErrorLocked(t *testing.T) {
+	var etype int8 = 1
+
+	var event *fb.Event
+	{
+		var builder = flatbuffers.NewBuilder(0)
+		var error = builder.CreateString("user_temporarily_disabled")
+		fb.EventStart(builder)
+		fb.EventAddType(builder, etype)
+		fb.EventAddError(builder, error)
+		var eventOffset = fb.EventEnd(builder)
+		builder.Finish(eventOffset)
+		event = fb.GetRootAsEvent(builder.FinishedBytes(), 0)
+	}
+
+	var m = eventToMap(event)
+	assert.Equal(t, "TEMPORARILY_LOCKED", m[database.CtEventType])
+
+}
+
+func TestEventToMapLogonErrorCustom(t *testing.T) {
+	var etype int8 = 1
+
+	var event *fb.Event
+	{
+		var builder = flatbuffers.NewBuilder(0)
+		var error = builder.CreateString("custom_error")
+		fb.EventStart(builder)
+		fb.EventAddType(builder, etype)
+		fb.EventAddError(builder, error)
+		var eventOffset = fb.EventEnd(builder)
+		builder.Finish(eventOffset)
+		event = fb.GetRootAsEvent(builder.FinishedBytes(), 0)
+	}
+
+	var m = eventToMap(event)
+	assert.Equal(t, "LOGON_ERROR", m[database.CtEventType])
+
+}
+
 func TestEventToMapLogout(t *testing.T) {
 	var etype int8 = 4