Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

Validate BINVAL values of vcard elements as Base64

Browse Source
This commit is contained in:
Evgeny Khramtsov 2019-08-02 14:20:10 +03:00
parent 5a976719fb
commit 4dac9f1e6d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -26,7 +26,7 @@
{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}},
{xmpp, ".*", {git, "https://github.com/processone/xmpp", "d2b3c3c"}}, {xmpp, ".*", {git, "https://github.com/processone/xmpp", "d2b3c3c"}},
{fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}},
{yconf, ".*", {git, "https://github.com/processone/yconf", "4bdf771"}}, {yconf, ".*", {git, "https://github.com/processone/yconf", "97a1189"}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
{p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.5"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.5"}}},
{pkix, ".*", {git, "https://github.com/processone/pkix", "2d7a3b8"}}, {pkix, ".*", {git, "https://github.com/processone/pkix", "2d7a3b8"}},

11
src/econf.erl
View File

@ -37,7 +37,7 @@
-export([ip/0, ipv4/0, ipv6/0, ip_mask/0, port/0]). -export([ip/0, ipv4/0, ipv6/0, ip_mask/0, port/0]).
-export([re/0, re/1, glob/0, glob/1]). -export([re/0, re/1, glob/0, glob/1]).
-export([path/0, binary_sep/1]). -export([path/0, binary_sep/1]).
-export([beam/0, beam/1]). -export([beam/0, beam/1, base64/0]).
-export([timeout/1, timeout/2]). -export([timeout/1, timeout/2]).
%% Composite types %% Composite types
-export([list/1, list/2]). -export([list/1, list/2]).
@ -338,6 +338,9 @@ timeout(Units) ->
timeout(Units, Inf) -> timeout(Units, Inf) ->
yconf:timeout(Units, Inf). yconf:timeout(Units, Inf).
base64() ->
yconf:base64().
non_empty(F) -> non_empty(F) ->
yconf:non_empty(F). yconf:non_empty(F).
@ -576,7 +579,7 @@ vcard_photo() ->
vcard_validator( vcard_validator(
vcard_photo, undefined, vcard_photo, undefined,
[{type, undefined, binary()}, [{type, undefined, binary()},
{binval, undefined, binary()}, {binval, undefined, base64()},
{extval, undefined, binary()}]). {extval, undefined, binary()}]).
-spec vcard_adr() -> yconf:validator(). -spec vcard_adr() -> yconf:validator().
@ -653,7 +656,7 @@ vcard_logo() ->
vcard_validator( vcard_validator(
vcard_logo, undefined, vcard_logo, undefined,
[{type, undefined, binary()}, [{type, undefined, binary()},
{binval, undefined, binary()}, {binval, undefined, base64()},
{extval, undefined, binary()}]). {extval, undefined, binary()}]).
-spec vcard_org() -> yconf:validator(). -spec vcard_org() -> yconf:validator().
@ -668,7 +671,7 @@ vcard_sound() ->
vcard_validator( vcard_validator(
vcard_sound, undefined, vcard_sound, undefined,
[{phonetic, undefined, binary()}, [{phonetic, undefined, binary()},
{binval, undefined, binary()}, {binval, undefined, base64()},
{extval, undefined, binary()}]). {extval, undefined, binary()}]).
-spec vcard_key() -> yconv:validator(). -spec vcard_key() -> yconv:validator().