Add support for LDAP and SAML groups

CHANGELOG.md

@@ -15,7 +15,9 @@
   Active Directory Federations Services (ADFS) as IdP using WS-TRUST auth endpoint
   "/adfs/services/trust/13/usernamemixed"
   [#304](https://github.com/vmware/go-vcloud-director/pull/304)
-
+* Add support for group management using `CreateGroup`, `GetGroupByHref`, `GetGroupById`,
+  `GetGroupByName`, `GetGroupByNameOrId`, `Delete`, `Update`, `NewGroup` functions [#314](https://github.com/vmware/go-vcloud-director/pull/314)
+* Add LDAP administration functions for Org `LdapConfigure`, `GetLdapConfiguration`, and `LdapDisable` [#314](https://github.com/vmware/go-vcloud-director/pull/314)
 
 ## 2.7.0 (April 10,2020)
 

Makefile

@@ -7,7 +7,7 @@ default: fmtcheck vet static build
 # test runs the test suite and vets the code
 test: testunit
 	@echo "==> Running Functional Tests"
-	cd govcd && go test -tags "functional" -timeout=200m -check.vv .
+	cd govcd && go test -tags "functional" -timeout=300m -check.vv .
 
 # testunit runs the unit tests
 testunit: fmtcheck

govcd/adminorg_administration.go

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 VMware, Inc.  All rights reserved.  Licensed under the Apache v2 License.
+ */
+
+package govcd
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/vmware/go-vcloud-director/v2/types/v56"
+	"github.com/vmware/go-vcloud-director/v2/util"
+)
+
+// LdapConfigure allows to configure LDAP mode in use by the Org
+func (adminOrg *AdminOrg) LdapConfigure(settings *types.OrgLdapSettingsType) (*types.OrgLdapSettingsType, error) {
+	util.Logger.Printf("[DEBUG] Configuring LDAP mode for Org name %s", adminOrg.AdminOrg.Name)
+
+	// Xmlns field is not mandatory when `types.OrgLdapSettingsType` is set as part of whole
+	// `AdminOrg` structure but it must be set when directly updating LDAP. For that reason
+	// `types.OrgLdapSettingsType` Xmlns struct tag has 'omitempty' set
+	settings.Xmlns = types.XMLNamespaceVCloud
+
+	href := adminOrg.AdminOrg.HREF + "/settings/ldap"
+	_, err := adminOrg.client.ExecuteRequest(href, http.MethodPut, types.MimeOrgLdapSettings,
+		"error updating LDAP settings: %s", settings, nil)
+	if err != nil {
+		return nil, fmt.Errorf("error updating LDAP mode for Org name '%s': %s", adminOrg.AdminOrg.Name, err)
+	}
+
+	ldapSettings, err := adminOrg.GetLdapConfiguration()
+	if err != nil {
+		return nil, fmt.Errorf("error retrieving LDAP configuration:  %s", err)
+	}
+
+	return ldapSettings, nil
+}
+
+// LdapDisable wraps LdapConfigure to disable LDAP configuration for org
+func (adminOrg *AdminOrg) LdapDisable() error {
+	_, err := adminOrg.LdapConfigure(&types.OrgLdapSettingsType{OrgLdapMode: types.LdapModeNone})
+	return err
+}
+
+// GetLdapConfiguration retrieves LDAP configuration structure
+func (adminOrg *AdminOrg) GetLdapConfiguration() (*types.OrgLdapSettingsType, error) {
+	util.Logger.Printf("[DEBUG] Reading LDAP configuration for Org name %s", adminOrg.AdminOrg.Name)
+
+	ldapSettings := &types.OrgLdapSettingsType{}
+
+	href := adminOrg.AdminOrg.HREF + "/settings/ldap"
+
+	_, err := adminOrg.client.ExecuteRequest(href, http.MethodGet, types.MimeOrgLdapSettings,
+		"error getting LDAP settings: %s", nil, ldapSettings)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return ldapSettings, nil
+}

govcd/adminorg_administration_test.go

@@ -0,0 +1,75 @@
+// +build org functional ALL
+
+/*
+ * Copyright 2020 VMware, Inc.  All rights reserved.  Licensed under the Apache v2 License.
+ */
+
+package govcd
+
+import (
+	"fmt"
+
+	"github.com/vmware/go-vcloud-director/v2/types/v56"
+	. "gopkg.in/check.v1"
+)
+
+// Test_LDAP_Configuration tests LDAP configuration functions
+func (vcd *TestVCD) Test_LDAP_Configuration(check *C) {
+	if vcd.skipAdminTests {
+		check.Skip(fmt.Sprintf(TestRequiresSysAdminPrivileges, check.TestName()))
+	}
+
+	org, err := vcd.client.GetAdminOrgByName(vcd.config.VCD.Org)
+	check.Assert(err, IsNil)
+
+	ldapSettings := &types.OrgLdapSettingsType{
+		OrgLdapMode: types.LdapModeCustom,
+		CustomOrgLdapSettings: &types.CustomOrgLdapSettings{
+			HostName:                "1.1.1.1",
+			Port:                    389,
+			SearchBase:              "dc=planetexpress,dc=com",
+			AuthenticationMechanism: "SIMPLE",
+			ConnectorType:           "OPEN_LDAP",
+			Username:                "cn=admin,dc=planetexpress,dc=com",
+			Password:                "GoodNewsEveryone",
+			UserAttributes: &types.OrgLdapUserAttributes{
+				ObjectClass:               "inetOrgPerson",
+				ObjectIdentifier:          "uid",
+				Username:                  "uid",
+				Email:                     "mail",
+				FullName:                  "cn",
+				GivenName:                 "givenName",
+				Surname:                   "sn",
+				Telephone:                 "telephoneNumber",
+				GroupMembershipIdentifier: "dn",
+			},
+			GroupAttributes: &types.OrgLdapGroupAttributes{
+				ObjectClass:          "group",
+				ObjectIdentifier:     "cn",
+				GroupName:            "cn",
+				Membership:           "member",
+				MembershipIdentifier: "dn",
+			},
+		},
+	}
+	gotSettings, err := org.LdapConfigure(ldapSettings)
+	check.Assert(err, IsNil)
+
+	AddToCleanupList("LDAP-configuration", "orgLdapSettings", org.AdminOrg.Name, check.TestName())
+
+	check.Assert(ldapSettings.CustomOrgLdapSettings.GroupAttributes, DeepEquals, gotSettings.CustomOrgLdapSettings.GroupAttributes)
+	check.Assert(ldapSettings.CustomOrgLdapSettings.UserAttributes, DeepEquals, gotSettings.CustomOrgLdapSettings.UserAttributes)
+	check.Assert(ldapSettings.CustomOrgLdapSettings.UserAttributes, DeepEquals, gotSettings.CustomOrgLdapSettings.UserAttributes)
+	check.Assert(ldapSettings.CustomOrgLdapSettings.Username, DeepEquals, gotSettings.CustomOrgLdapSettings.Username)
+	check.Assert(ldapSettings.CustomOrgLdapSettings.AuthenticationMechanism, DeepEquals, gotSettings.CustomOrgLdapSettings.AuthenticationMechanism)
+	check.Assert(ldapSettings.CustomOrgLdapSettings.ConnectorType, DeepEquals, gotSettings.CustomOrgLdapSettings.ConnectorType)
+
+	err = org.LdapDisable()
+	check.Assert(err, IsNil)
+
+	ldapConfig, err := org.GetLdapConfiguration()
+	check.Assert(err, IsNil)
+
+	check.Assert(ldapConfig.OrgLdapMode, Equals, types.LdapModeNone)
+
+}