diff --git a/pkg/js/generated/go/libldap/ldap.go b/pkg/js/generated/go/libldap/ldap.go index ffb2aeaa8..32ac0d4f5 100644 --- a/pkg/js/generated/go/libldap/ldap.go +++ b/pkg/js/generated/go/libldap/ldap.go @@ -15,48 +15,52 @@ func init() { module.Set( gojs.Objects{ // Functions - "JoinFilters": func(f ...string) string { return lib_ldap.JoinFilters(f...) }, - "NegativeFilter": func(f string) string { return lib_ldap.NegativeFilter(f) }, - "DecodeSID": func(s string) string { return lib_ldap.DecodeSID(s) }, - "DecodeADTimestamp": func(s string) string { return lib_ldap.DecodeADTimestamp(s) }, - "DecodeZuluTimestamp": func(s string) string { return lib_ldap.DecodeZuluTimestamp(s) }, + "DecodeADTimestamp": lib_ldap.DecodeADTimestamp, + "DecodeSID": lib_ldap.DecodeSID, + "DecodeZuluTimestamp": lib_ldap.DecodeZuluTimestamp, + "JoinFilters": lib_ldap.JoinFilters, + "NegativeFilter": lib_ldap.NegativeFilter, // Var and consts - "FilterIsPerson": func() string { return lib_ldap.FilterIsPerson }, - "FilterIsGroup": func() string { return lib_ldap.FilterIsGroup }, - "FilterIsComputer": func() string { return lib_ldap.FilterIsComputer }, - "FilterIsAdmin": func() string { return lib_ldap.FilterIsAdmin }, - "FilterLogonScript": func() string { return lib_ldap.FilterLogonScript }, - "FilterAccountDisabled": func() string { return lib_ldap.FilterAccountDisabled }, - "FilterAccountEnabled": func() string { return lib_ldap.FilterAccountEnabled }, - "FilterHomedirRequired": func() string { return lib_ldap.FilterHomedirRequired }, - "FilterLockout": func() string { return lib_ldap.FilterLockout }, - "FilterPasswordNotRequired": func() string { return lib_ldap.FilterPasswordNotRequired }, - "FilterPasswordCantChange": func() string { return lib_ldap.FilterPasswordCantChange }, - "FilterCanSendEncryptedPassword": func() string { return lib_ldap.FilterCanSendEncryptedPassword }, - "FilterIsDuplicateAccount": func() string { return lib_ldap.FilterIsDuplicateAccount }, - "FilterIsNormalAccount": func() string { return lib_ldap.FilterIsNormalAccount }, - "FilterInterdomainTrustAccount": func() string { return lib_ldap.FilterInterdomainTrustAccount }, - "FilterWorkstationTrustAccount": func() string { return lib_ldap.FilterWorkstationTrustAccount }, - "FilterServerTrustAccount": func() string { return lib_ldap.FilterServerTrustAccount }, - "FilterDontExpirePassword": func() string { return lib_ldap.FilterDontExpirePassword }, - "FilterMnsLogonAccount": func() string { return lib_ldap.FilterMnsLogonAccount }, - "FilterSmartCardRequired": func() string { return lib_ldap.FilterSmartCardRequired }, - "FilterTrustedForDelegation": func() string { return lib_ldap.FilterTrustedForDelegation }, - "FilterNotDelegated": func() string { return lib_ldap.FilterNotDelegated }, - "FilterUseDesKeyOnly": func() string { return lib_ldap.FilterUseDesKeyOnly }, - "FilterDontRequirePreauth": func() string { return lib_ldap.FilterDontRequirePreauth }, - "FilterPasswordExpired": func() string { return lib_ldap.FilterPasswordExpired }, - "FilterTrustedToAuthForDelegation": func() string { return lib_ldap.FilterTrustedToAuthForDelegation }, - "FilterPartialSecretsAccount": func() string { return lib_ldap.FilterPartialSecretsAccount }, + "FilterAccountDisabled": lib_ldap.FilterAccountDisabled, + "FilterAccountEnabled": lib_ldap.FilterAccountEnabled, + "FilterCanSendEncryptedPassword": lib_ldap.FilterCanSendEncryptedPassword, + "FilterDontExpirePassword": lib_ldap.FilterDontExpirePassword, + "FilterDontRequirePreauth": lib_ldap.FilterDontRequirePreauth, + "FilterHasServicePrincipalName": lib_ldap.FilterHasServicePrincipalName, + "FilterHomedirRequired": lib_ldap.FilterHomedirRequired, + "FilterInterdomainTrustAccount": lib_ldap.FilterInterdomainTrustAccount, + "FilterIsAdmin": lib_ldap.FilterIsAdmin, + "FilterIsComputer": lib_ldap.FilterIsComputer, + "FilterIsDuplicateAccount": lib_ldap.FilterIsDuplicateAccount, + "FilterIsGroup": lib_ldap.FilterIsGroup, + "FilterIsNormalAccount": lib_ldap.FilterIsNormalAccount, + "FilterIsPerson": lib_ldap.FilterIsPerson, + "FilterLockout": lib_ldap.FilterLockout, + "FilterLogonScript": lib_ldap.FilterLogonScript, + "FilterMnsLogonAccount": lib_ldap.FilterMnsLogonAccount, + "FilterNotDelegated": lib_ldap.FilterNotDelegated, + "FilterPartialSecretsAccount": lib_ldap.FilterPartialSecretsAccount, + "FilterPasswordCantChange": lib_ldap.FilterPasswordCantChange, + "FilterPasswordExpired": lib_ldap.FilterPasswordExpired, + "FilterPasswordNotRequired": lib_ldap.FilterPasswordNotRequired, + "FilterServerTrustAccount": lib_ldap.FilterServerTrustAccount, + "FilterSmartCardRequired": lib_ldap.FilterSmartCardRequired, + "FilterTrustedForDelegation": lib_ldap.FilterTrustedForDelegation, + "FilterTrustedToAuthForDelegation": lib_ldap.FilterTrustedToAuthForDelegation, + "FilterUseDesKeyOnly": lib_ldap.FilterUseDesKeyOnly, + "FilterWorkstationTrustAccount": lib_ldap.FilterWorkstationTrustAccount, // Types (value type) - "Metadata": func() lib_ldap.Metadata { return lib_ldap.Metadata{} }, - "LdapClient": lib_ldap.NewClient, + "ADObject": func() lib_ldap.ADObject { return lib_ldap.ADObject{} }, + "Client": lib_ldap.NewClient, + "Config": func() lib_ldap.Config { return lib_ldap.Config{} }, + "Metadata": func() lib_ldap.Metadata { return lib_ldap.Metadata{} }, // Types (pointer type) - // "NewMetadata": func() *lib_ldap.Metadata { return &lib_ldap.Metadata{} }, - // "NewLdapClient": func() *lib_ldap.LdapClient { return &lib_ldap.LdapClient{} }, + "NewADObject": func() *lib_ldap.ADObject { return &lib_ldap.ADObject{} }, + "NewConfig": func() *lib_ldap.Config { return &lib_ldap.Config{} }, + "NewMetadata": func() *lib_ldap.Metadata { return &lib_ldap.Metadata{} }, }, ).Register() } diff --git a/pkg/js/libs/ldap/utils.go b/pkg/js/libs/ldap/utils.go index 9bd0f0109..3c20a411c 100644 --- a/pkg/js/libs/ldap/utils.go +++ b/pkg/js/libs/ldap/utils.go @@ -7,6 +7,7 @@ import ( "time" ) +// DecodeSID decodes a SID string func DecodeSID(s string) string { b := []byte(s) revisionLvl := int(b[0]) @@ -39,6 +40,7 @@ func DecodeSID(s string) string { return builder.String() } +// DecodeADTimestamp decodes an Active Directory timestamp func DecodeADTimestamp(timestamp string) string { adtime, _ := strconv.ParseInt(timestamp, 10, 64) if (adtime == 9223372036854775807) || (adtime == 0) { @@ -49,6 +51,8 @@ func DecodeADTimestamp(timestamp string) string { return unixtime.Format("2006-01-02 3:4:5 pm") } +// DecodeZuluTimestamp decodes a Zulu timestamp +// example: 2021-08-25T14:00:00Z func DecodeZuluTimestamp(timestamp string) string { zulu, err := time.Parse(time.RFC3339, timestamp) if err != nil {