49f1275e20
Get rid of excessive (io)list_to_binary/1 calls
2016-11-24 15:06:06 +03:00
78a44e0176
Merge branch 'master' into xml-ng
...
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
2016-11-12 13:27:15 +03:00
98e0123ca4
New api permissions framework
2016-10-05 13:21:11 +02:00
ed62d705d8
Don't worry about storage_type of the Acl mnesia table ( #1206 )
2016-09-19 11:59:40 +02:00
da291d804c
Use mnesia calls instead of ets for Acl and Access tables ( #1206 )
2016-09-19 11:56:22 +02:00
d2621130a3
Typo
2016-09-08 10:27:14 +02:00
a8368278ec
Properly normalize resource_regexp acl rule
...
This fixes issue #1288 .
2016-09-08 08:45:10 +02:00
7a74a4836a
Merge pull request #1211 from processone/expand_api
...
There is still work to do, be we reached a stable state and can merge up to this point.
2016-07-28 14:57:48 +02:00
c26d38a893
Remove jlib dependency from acl.erl
2016-07-26 10:01:59 +03:00
5d4f8bcf0d
Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)
2016-07-25 16:57:05 +02:00
1485b56211
Move any access rules check to ACL module
2016-07-23 18:21:45 +02:00
f56cff925c
acl: ACLName rule should match if any part of ACLName matches
2016-06-24 15:09:51 +02:00
804190e4a8
Add acl:{access,shaper}_rules_validator for use in {mod_}opt_type()
2016-06-21 12:26:31 +02:00
1fb1e8721b
Allow using shaper defined by name like in in s2s_shaper: fast
2016-06-16 11:04:01 +02:00
0a09f27373
Typo in option name
2016-06-16 11:00:38 +02:00
7b308e0d41
Add shorter version of some common access rules definitions
...
This add conversion of
- allow
to
- allow: all
and
- allow: acl_name
to
- allow:
- acl: acl_name
(this works also for deny, and number in shapers)
2016-06-15 19:23:55 +02:00
e81302dc79
Allow @ inside acl user{,_glob,_regexp} to pass both user and server in single string
2016-05-30 12:30:44 +02:00
49658e1655
New ACL infrastructure
2016-05-26 11:08:53 +02:00
127342449e
Allow testing user pattern directly in access rules
2016-04-08 19:45:25 +02:00
47039aed15
Allow clearing all ACL and access rules
2016-04-06 18:13:08 +02:00
5ad8c790c7
Export add_access/3 to allow setting ACL outside of yaml config file
2016-04-06 18:13:08 +02:00
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
95265dd3ad
Move JID related functions to jid.erl ( #847 )
2015-11-24 18:44:13 +03:00
653105a44f
Fix acl issue from cleanup
2015-10-07 15:12:15 +02:00
6aeb9dcb38
cosmetic cleanup
2015-10-07 14:18:38 +02:00
fb6267f38e
Add config validation at startup
2015-06-01 15:38:27 +03:00
5a35405cd5
Update copyright dates to 2015 (EJAB-1733)
2015-01-08 17:34:43 +01:00
285c4c17cf
Merge pull request #146 from jamielinux/master
...
Update FSF address
2014-04-11 13:35:46 +02:00
5c36c44689
Remove annyoing warnings
2014-03-25 09:42:12 +04:00
d5f90965d7
Fix ACLs syntax change (thanks to jokker23)(issue #140 )
2014-03-24 19:40:55 +01:00
633d47f784
Update copyright dates to 2014 (EJAB-1679)
2014-03-13 12:30:57 +01:00
8538997d61
Update FSF address
2014-02-22 10:27:40 +00:00
d03de1bb43
Fix some type specs and errors
2013-12-10 21:44:46 +10:00
89a17ba84a
Correctly convert ACLs into YAML representation
2013-11-07 02:43:43 +10:00
91a74e3e27
Change configuration file format to YAML
2013-08-21 22:17:59 +10:00
0b9754884e
Do not distribute the ACL table
2013-08-21 19:37:08 +10:00
4d8f770624
Switch to rebar build tool
...
Use dynamic Rebar configuration
Make iconv dependency optional
Disable transient_supervisors compile option
Add hipe compilation support
Only compile ibrowse and lhttpc when needed
Make it possible to generate an OTP application release
Add --enable-debug compile option
Add --enable-all compiler option
Add --enable-tools configure option
Add --with-erlang configure option.
Add --enable-erlang-version-check configure option.
Add lager support
Improve the test suite
2013-06-13 11:11:02 +02:00
9deb294328
Accumulated patch to binarize and indent code
2013-03-14 10:33:02 +01:00
0ae400533c
Update copyright dates
2013-01-24 16:25:13 +02:00
437f68a9f3
Merge SQL and Mnesia code into one module (EJAB-1560)
2012-04-27 19:52:05 +10:00
41a0eae0bd
ODBC support for mod_shared_roster
2012-04-04 20:37:43 +10:00
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
48308042b6
Use the regexp frontend module (EJAB-921)
2011-12-08 12:40:04 +01:00
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
7b76fdcde7
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
...
SVN Revision: 2891
2010-01-12 16:11:32 +00:00
f09509502e
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
...
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1804
2009-01-12 14:44:42 +00:00
7808dc11af
* src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov)
...
* doc/guide.tex: Likewise
* src/mod_shared_roster.erl: Push new group members when
registered or manually added to group: EJAB-730 EJAB-731 EJAB-732
EJAB-767 EJAB-794. When user is added to group, push it to other
members, and other members to it. When user is removed from group,
push deletion to other members, and other members to it. When user
is registered, push him to members of group @all@. When user is
deleted, push deletion to members of group @all@. Document several
functions in mod_shared_roster.
* src/ejabberd_auth.erl: Rename hook user_registered to
register_user, for name consistency with the widely used hook
remove_user. Run hook register_user in ejabberd_auth, so it's run
when account is created with any method. Run hook remove_user in
ejabberd_auth, so it's run when account is deleted with any
method.
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/mod_register.erl: Likewise
SVN Revision: 1752
2008-12-23 19:15:33 +00:00
c3bda4aaee
* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
...
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise
SVN Revision: 1499
2008-07-31 11:18:49 +00:00
c88a4650ba
* src/ejabberd_c2s.erl: Added forbidden_session_hook
...
* src/acl.erl: New access types: resource, resource_regexp and
resource_glob
* doc/guide.tex: Likewise
SVN Revision: 1301
2008-04-25 09:25:31 +00:00
866e5c2d82
* src/acl.erl: Normalize ACL before adding to the configuration
...
tables (EJAB-521)
SVN Revision: 1185
2008-02-12 01:04:47 +00:00
Evgeniy Khramtsov