fix: some fixes and improved test coverage (dexidp#29)

palexster · Nov 9, 2023 · 501e7d7 · 501e7d7
1 parent 8bcfbe4
commit 501e7d7
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 4 deletions.
diff --git a/pkg/webhook/connectors/helpers.go b/pkg/webhook/connectors/helpers.go
@@ -44,10 +44,10 @@ func unwrapConnectorWebhookPayload(filteredConnectors []ConnectorContext,
 	initialConnectors []storage.Connector,
 ) []storage.Connector {
 	mappedConnectors := make([]storage.Connector, 0)
-	for i, filteredConnector := range filteredConnectors {
+	for _, filteredConnector := range filteredConnectors {
 		for _, initialConnector := range initialConnectors {
 			if filteredConnector.ID == initialConnector.ID {
-				mappedConnectors = append(mappedConnectors, initialConnectors[i])
+				mappedConnectors = append(mappedConnectors, initialConnector)
 			}
 		}
 	}

diff --git a/pkg/webhook/connectors/helpers_test.go b/pkg/webhook/connectors/helpers_test.go
@@ -65,3 +65,105 @@ func Test_CreatePayload_ScopeConnectorsValidation(t *testing.T) {
 		},
 	})
 }
+
+func Test_MultipleConnectorValidation(t *testing.T) {
+	payload := createConnectorWebhookPayload(&config.HookRequestScope{}, []storage.Connector{
+		{ID: "test1", Type: "ldap", Name: "test1", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "ldap", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	}, &http.Request{})
+	assert.Equal(t, payload, &FilterWebhookPayload{
+		Request: RequestContext{
+			Headers: map[string][]string{},
+			Params:  map[string][]string{},
+		},
+		Connectors: []ConnectorContext{
+			{ID: "test1", Type: "ldap", Name: "test1"},
+			{ID: "test2", Type: "ldap", Name: "test2"},
+		},
+	})
+}
+
+func Test_UnwrapConnectorWebhookPayload_Empty(t *testing.T) {
+	filteredConnectors := []ConnectorContext{}
+	initialConnectors := []storage.Connector{}
+	mappedConnectors := unwrapConnectorWebhookPayload(filteredConnectors, initialConnectors)
+	assert.Equal(t, mappedConnectors, []storage.Connector{})
+}
+
+func Test_UnwrapConnectorWebhookPayload_LocalLDAP(t *testing.T) {
+	filteredConnectors := []ConnectorContext{
+		{ID: "test2", Type: "ldap", Name: "test2"},
+		{ID: "test3", Type: "ldap", Name: "test3"},
+	}
+	initialConnectors := []storage.Connector{
+		{ID: "test1", Type: "ldap", Name: "test1", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "ldap", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test3", Type: "ldap", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	}
+	mappedConnectors := unwrapConnectorWebhookPayload(filteredConnectors, initialConnectors)
+	assert.Equal(t, mappedConnectors, []storage.Connector{
+		{ID: "test2", Type: "ldap", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test3", Type: "ldap", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	})
+}
+
+func Test_UnwrapConnectorWebhookPayload_DifferentOrder(t *testing.T) {
+	filteredConnectors := []ConnectorContext{
+		{ID: "test3", Type: "ldap", Name: "test3"},
+		{ID: "test2", Type: "ldap", Name: "test2"},
+	}
+	initialConnectors := []storage.Connector{
+		{ID: "test1", Type: "ldap", Name: "test1", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "ldap", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test3", Type: "ldap", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	}
+	mappedConnectors := unwrapConnectorWebhookPayload(filteredConnectors, initialConnectors)
+	assert.Equal(t, mappedConnectors, []storage.Connector{
+		{ID: "test3", Type: "ldap", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "ldap", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	})
+}
+
+func Test_UnwrapConnectorWebhookPayload_LocalOIDC(t *testing.T) {
+	filteredConnectors := []ConnectorContext{
+		{ID: "test3", Type: "oidc", Name: "test3"},
+	}
+	initialConnectors := []storage.Connector{
+		{ID: "test1", Type: "oidc", Name: "test1", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "oidc", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test3", Type: "oidc", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	}
+	mappedConnectors := unwrapConnectorWebhookPayload(filteredConnectors, initialConnectors)
+	assert.Equal(t, mappedConnectors, []storage.Connector{
+		{ID: "test3", Type: "oidc", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	})
+}
+
+func Test_UnwrapConnectorWebhookPayload_NotExisting(t *testing.T) {
+	filteredConnectors := []ConnectorContext{
+		{ID: "test4", Type: "oidc", Name: "test4"},
+	}
+	initialConnectors := []storage.Connector{
+		{ID: "test1", Type: "oidc", Name: "test1", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "oidc", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test3", Type: "oidc", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	}
+	mappedConnectors := unwrapConnectorWebhookPayload(filteredConnectors, initialConnectors)
+	assert.Equal(t, mappedConnectors, []storage.Connector{})
+}
+
+func Test_UnwrapConnectorWebhookPayload_NotExistingTest(t *testing.T) {
+	filteredConnectors := []ConnectorContext{
+		{ID: "test4", Type: "oidc", Name: "test4"},
+		{ID: "test3", Type: "oidc", Name: "test3"},
+	}
+	initialConnectors := []storage.Connector{
+		{ID: "test1", Type: "oidc", Name: "test1", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test2", Type: "oidc", Name: "test2", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+		{ID: "test3", Type: "oidc", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	}
+	mappedConnectors := unwrapConnectorWebhookPayload(filteredConnectors, initialConnectors)
+	assert.Equal(t, mappedConnectors, []storage.Connector{
+		{ID: "test3", Type: "oidc", Name: "test3", ResourceVersion: "123", Config: []byte(`{"some":"data"}`)},
+	})
+}
diff --git a/server/handlers.go b/server/handlers.go
@@ -147,16 +147,18 @@ func (s *Server) handleAuthorization(w http.ResponseWriter, r *http.Request) {
 	FilteredConnectors := []storage.Connector{}
 	FilteredConnectors = append(FilteredConnectors, connectors...)
 	// Webhook to filter out providers
-	s.logger.Infof("Connectors: %v", connectors)
+
+	s.logger.Infof("Connectors: %d", len(FilteredConnectors))
 	s.logger.Infof("Invoking %d hooks to filter connectors", len(s.connectorWebhookFilter))
 	for _, c := range s.connectorWebhookFilter {
-		s.logger.Infof("Calling connectors webhook %v", c)
+		s.logger.Infof("Calling connectors webhook %s", c.Name)
 		FilteredConnectors, err = c.FilterInvoker.CallHook(FilteredConnectors, r)
 		if err != nil {
 			s.logger.Errorf("Failed to filter connectors: %v", err)
 			s.renderError(r, w, http.StatusInternalServerError, "Failed to retrieve connector list.")
 			return
 		}
+		s.logger.Infof("Connectors after webhook  %s: %d", c.Name, len(FilteredConnectors))
 	}
 	connectors = FilteredConnectors