Skip to content

F
freeswitch
提交 4a623c45 authored 作者: William King's avatar William King
浏览文件
操作

Merge pull request #231 in FS/freeswitch from ~SEKIL/freeswitch-7412:master to master 

* commit 'f5e0a879':
  JIRA FS-7412. Added new LDAP schema (fsaccount.schema) with relevant attributes to match FS directory params and variables. Changed mod_xml_ldap code to reflect new schema. Updated xml_ldap.conf.xml as well to reflect mapping of new attributes.
上级 d7a1f3d4 f5e0a879
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 428 行增加 和 23 行删除
src/mod/xml_int/mod_xml_ldap/conf/autoload_configs/xml_ldap.conf.xml 0 → 100644
浏览文件 @ 4a623c45
<configuration name="xml_ldap.conf" description=" XML LDAP Gateway">
<bindings>
<binding name="directory">
<!--%s is populated with the extension -->
<!--filter example with custom objectClass -->
<param name="filter" value="(&amp;(objectClass=FSAccount)(fsuid=%s))" bindings="directory"/>
<!--basedn for the searches %s is replaced with domain-->
<param name="basedn" value="ou=%s,ou=customers,o=example" />
<param name="url" value="ldap://1.2.3.4" />
<param name="binddn" value="cn=admin,o=example" />
<param name="bindpass" value="secret" />
<trans>
<!-- mapping of ldap attrs into FS attrs - fsaccount.schema -->
<tran name="id" mapfrom="fsUid" />
<tran name="cidr" mapfrom="fsCIDR" />
<tran name="number-alias" mapfrom="fsNumberAlias" />
<tran name="dial-string" mapfrom="fsDialString" />
<tran name="password" mapfrom="fsPassword" />
<tran name="a1-hash" mapfrom="fsA1Hash" />
<tran name="reverse-auth-user" mapfrom="fsReverseAuthUser" />
<tran name="reverse-auth-pass" mapfrom="fsReverseAuthPass" />
<tran name="vm-enabled" mapfrom="fsVmEnabled" />
<tran name="vm-password" mapfrom="fsVmPassword" />
<tran name="vm-mailto" mapfrom="fsVmMailTo" />
<tran name="vm-notify-mailto" mapfrom="fsVmNotifyMailTo" />
<tran name="vm-attach-file" mapfrom="fsVmAttachFile" />
<tran name="vm-message-ext" mapfrom="fsVmMessageExt" />
<tran name="vm-email-all-messages" mapfrom="fsVmEmailAllMessages" />
<tran name="vm-keep-local-after-email" mapfrom="fsVmKeepLocalAfterEmail" />
<tran name="vm-notify-email-all-messages" mapfrom="fsVmNotifyEmailAllMessages" />
<tran name="vm-skip-instructions" mapfrom="fsVmSkipInstructions" />
<tran name="vm-cc" mapfrom="fsVmCc" />
<tran name="vm-disk-quota" mapfrom="fsVmDiskQuota" />
<tran name="accountcode" mapfrom="fsAccountCode" />
<tran name="user_context" mapfrom="fsUserContext" />
<tran name="vm_mailbox" mapfrom="fsVmMailbox" />
<tran name="callgroup" mapfrom="fsCallGroup" />
<tran name="toll_allow" mapfrom="fsTollAllow" />
<tran name="effective_caller_id_number" mapfrom="fsEffectiveCallerIDNumber" />
<tran name="effective_caller_id_name" mapfrom="fsEffectiveCallerIDName" />
<tran name="outbound_caller_id_number" mapfrom="fsOutboundCallerIDNumber" />
<tran name="outbound_caller_id_name" mapfrom="fsOutboundCallerIDName" />
</trans>
</binding>
<!-- <binding name="configuration">
<param name="filter" value="(%s=%s)" bindings="configuration"/>
<param name="basedn" value=",ou=config,o=example" />
<param name="url" value="ldap://ldapuri" />
<param name="binddn" value="cn=admin,o=example" />
<param name="bindpass" value="secret" />
</binding>
-->
</bindings>
</configuration>
src/mod/xml_int/mod_xml_ldap/fsaccount.schema 0 → 100644
浏览文件 @ 4a623c45
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.1 NAME 'fsUid'
DESC 'FreeSWITCH directory user id'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.2 NAME 'fsCIDR'
DESC 'FreeSWITCH directory user id cidr'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.3 NAME 'fsNumberAlias'
DESC 'FreeSWITCH directory user id number-alias'
EQUALITY numericStringMatch
SUBSTR numericStringSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.4 NAME 'fsDialString'
DESC 'FreeSWITCH directory dial-string param'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.5 NAME 'fsPassword'
DESC 'FreeSWITCH directory password param'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.6 NAME 'fsReverseAuthUser'
DESC 'FreeSWITCH directory reverse-auth-user param'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.7 NAME 'fsReverseAuthPass'
DESC 'FreeSWITCH directory reverse-auth-pass param'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.8 NAME 'fsA1Hash'
DESC 'FreeSWITCH directory a1-hash param'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.9 NAME 'fsVmPassword'
DESC 'FreeSWITCH directory vm-password param'
EQUALITY numericStringMatch
SUBSTR numericStringSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.10 NAME 'fsVmEnabled'
DESC 'FreeSWITCH directory vm-enabled param'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.11 NAME 'fsVmMailFrom'
DESC 'FreeSWITCH directory vm-mailfrom param'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.12 NAME 'fsVmMailTo'
DESC 'FreeSWITCH directory vm-mailto param'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.13 NAME 'fsVmNotifyMailTo'
DESC 'FreeSWITCH directory vm-notify-mailto param'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.14 NAME 'fsVmAttachFile'
DESC 'FreeSWITCH directory vm-attach-file param'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.15 NAME 'fsVmMessageExt'
DESC 'FreeSWITCH directory vm-message-ext param'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.16 NAME 'fsVmEmailAllMessages'
DESC 'FreeSWITCH directory vm-email-all-messages param'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.17 NAME 'fsVmKeepLocalAfterEmail'
DESC 'FreeSWITCH directory vm-keep-local-after-email param'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.18 NAME 'fsVmNotifyEmailAllMessages'
DESC 'FreeSWITCH directory vm-notify-email-all-messages param'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.19 NAME 'fsVmSkipInstructions'
DESC 'FreeSWITCH directory vm-skip-instructions param'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.20 NAME 'fsVmCc'
DESC 'FreeSWITCH directory vm-cc param'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.21 NAME 'fsVmDiskQuota'
DESC 'FreeSWITCH directory vm-disk-quota param'
EQUALITY numericStringMatch
SUBSTR numericStringSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.22 NAME 'fsAccountCode'
DESC 'FreeSWITCH directory accountcode variable'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.23 NAME 'fsUserContext'
DESC 'FreeSWITCH directory user_context variable'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.24 NAME 'fsVmMailbox'
DESC 'FreeSWITCH directory vm_mailbox variable'
EQUALITY numericStringMatch
SUBSTR numericStringSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.25 NAME 'fsCallGroup'
DESC 'FreeSWITCH directory callgroup variable'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.26 NAME ('fsTollAllow' 'fsRuleSet')
DESC 'FreeSWITCH directory toll_allow variable'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.27 NAME 'fsEffectiveCallerIDNumber'
DESC 'FreeSWITCH directory effective_caller_id_number variable'
EQUALITY numericStringMatch
SUBSTR numericStringSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.28 NAME 'fsEffectiveCallerIDName'
DESC 'FreeSWITCH directory effective_caller_id_name variable'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
ORDERING caseExactOrderingMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.29 NAME 'fsOutboundCallerIDNumber'
DESC 'FreeSWITCH directory outbound_caller_id_number variable'
EQUALITY numericStringMatch
SUBSTR numericStringSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.30 NAME 'fsOutboundCallerIDName'
DESC 'FreeSWITCH directory outbound_caller_id_name variable'
EQUALITY caseExactMatch
SUBSTR caseExactSubstringsMatch
ORDERING caseExactOrderingMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.27880.1003.1.1.31 NAME 'fsDomainName'
DESC 'FreeSWITCH directory domain name'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
objectclass (1.3.6.1.4.1.27880.1003.2.1 NAME 'FSAccount'
SUP top AUXILIARY
DESC 'FreeSWITCH Directory Account (v1.1)'
MAY ( fsUid $ fsCIDR $ fsNumberAlias $ fsDialString $ fsPassword $
fsReverseAuthUser $ fsReverseAuthPass $ fsA1Hash $ fsVmMessageExt $
fsVmPassword $ fsVmEnabled $ fsVmMailFrom $ fsVmMailTo $
fsVmNotifyMailTo $ fsVmAttachFile $ fsVmMessageExt $
fsVmEmailAllMessages $ fsVmKeepLocalAfterEmail $ fsVmNotifyEmailAllMessages $
fsVmSkipInstructions $ fsVmCc $ fsVmDiskQuota $ fsAccountCode $
fsUserContext $ fsVmMailbox $ fsCallGroup $ fsTollAllow $
fsEffectiveCallerIDNumber $ fsEffectiveCallerIDName $
fsOutboundCallerIDNumber $ fsOutboundCallerIDName $ fsDomainName ))
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论