Add allowedDomains to Microsoft connector.

connector/microsoft/microsoft.go

@@ -63,6 +63,8 @@
 	DomainHint string `json:"domainHint"`
 
 	Scopes []string `json:"scopes"` // defaults to scopeUser (user.read)
+
+	AllowedDomains []string `json:"allowedDomains"`
 }
 
 // Open returns a strategy for logging in through Microsoft.
@@ -83,6 +85,7 @@
 		promptType:           c.PromptType,
 		domainHint:           c.DomainHint,
 		scopes:               c.Scopes,
+		allowedDomains:       c.AllowedDomains,
 	}
 
 	if m.apiURL == "" {
@@ -138,6 +141,7 @@
 	promptType           string
 	domainHint           string
 	scopes               []string
+	allowedDomains       []string
 }
 
 func (c *microsoftConnector) isOrgTenant() bool {
@@ -217,6 +221,11 @@
 		user.Email = strings.ToLower(user.Email)
 	}
 
+	// Check if the email's domain is in the allowed list
+	if !c.isAllowedDomain(user.Email) {
+		return identity, fmt.Errorf("email (%s) domain not allowed", user.Email)
+	}
+
 	identity = connector.Identity{
 		UserID:        user.ID,
 		Username:      user.Name,
@@ -531,3 +540,22 @@
 	}
 	return e.error + ": " + e.errorDescription
 }
+
+func (c *microsoftConnector) isAllowedDomain(email string) bool {
+
+	if len(c.allowedDomains) == 0 {
+		return true
+	}
+
+	parts := strings.Split(email, "@")
+	if len(parts) != 2 {
+		return false
+	}
+	domain := parts[1]
+	for _, d := range c.allowedDomains {
+		if d == domain {
+			return true
+		}
+	}
+	return false
+}

connector/microsoft/microsoft_test.go

@@ -3,6 +3,7 @@ package microsoft
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -119,6 +120,66 @@ func TestUserGroupsFromGraphAPI(t *testing.T) {
 	expectEquals(t, identity.Groups, []string{"a", "b"})
 }
 
+func TestDomainNotAllowed(t *testing.T) {
+	s := newTestServer(map[string]testResponse{
+		"/v1.0/me?$select=id,displayName,userPrincipalName": {
+			data: user{ID: "S56767889", Name: "Jane Doe", Email: "[email protected]"},
+		},
+		"/" + tenant + "/oauth2/v2.0/token": dummyToken,
+	})
+	defer s.Close()
+
+	req, _ := http.NewRequest("GET", s.URL, nil)
+
+	c := microsoftConnector{apiURL: s.URL, graphURL: s.URL, tenant: tenant, allowedDomains: []string{"dcode.tech"}}
+	identity, err := c.HandleCallback(connector.Scopes{Groups: false}, req)
+
+	assert.Error(t, err, "email ([email protected]) domain not allowed")
+	assert.Equal(t, connector.Identity{}, identity)
+}
+
+func TestDomainListAllowed(t *testing.T) {
+	testCases := []struct {
+		email   string
+		allowed bool
+		domain  string
+	}{
+		{"[email protected]", true, "dcode.tech"},              // Allowed domain
+		{"[email protected]", true, "example.com"},          // Allowed domain
+		{"[email protected]", false, "otherdomain.com"}, // Not allowed domain
+	}
+
+	for _, tc := range testCases {
+		s := newTestServer(map[string]testResponse{
+			"/v1.0/me?$select=id,displayName,userPrincipalName": {
+				data: user{ID: "S56767889", Name: "John Doe", Email: tc.email},
+			},
+			"/" + tenant + "/oauth2/v2.0/token": dummyToken,
+		})
+		defer s.Close()
+
+		req, _ := http.NewRequest("GET", s.URL, nil)
+
+		// Setup the microsoftConnector with allowed domains
+		c := microsoftConnector{
+			apiURL:         s.URL,
+			graphURL:       s.URL,
+			tenant:         tenant,
+			allowedDomains: []string{"dcode.tech", "example.com"},
+		}
+
+		identity, err := c.HandleCallback(connector.Scopes{Groups: false}, req)
+
+		if tc.allowed {
+			assert.NoError(t, err, "Expected no error for allowed domain: "+tc.domain)
+			assert.NotEqual(t, connector.Identity{}, identity, "Expected a non-empty identity struct")
+		} else {
+			assert.Error(t, err, "Expected error for non-allowed domain: "+tc.email)
+			assert.Equal(t, connector.Identity{}, identity, "Expected an empty identity struct")
+		}
+	}
+}
+
 func newTestServer(responses map[string]testResponse) *httptest.Server {
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		response, found := responses[r.RequestURI]