diff options
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | mix.exs | 2 | ||||
| -rw-r--r-- | src/cyrsasl_scram.erl | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 51fd036d..ce5aafe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,21 +29,20 @@ install: before_script: # Ulimit: See Travis-CI issue report: https://github.com/travis-ci/travis-ci/issues/3328 - - sudo sh -c 'ulimit -n 4096' - - sudo sh -c 'echo "ulimit -n 4096" > /etc/default/riak' + - echo 'ulimit -n 4096' > riak + - sudo mv riak /etc/default/riak - mkdir "$PWD/ebin" - echo "[{riak_kv, [{add_paths, [\"$PWD/ebin/\"]}]}]." > advanced.config - sudo mv advanced.config /etc/riak/advanced.config - sudo service riak restart + - sudo riak-admin wait-for-service riak_kv 'riak@127.0.0.1' + - sudo riak-admin test - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';" - mysql -u root -e "CREATE DATABASE ejabberd_test;" - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';" - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';" - psql -U postgres -c "CREATE DATABASE ejabberd_test;" - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;" - - sudo /usr/sbin/riak-admin wait-for-service riak_kv 'riak@127.0.0.1' - - sudo /usr/sbin/riak-admin test - # - tail -n 100000 /etc/riak/* script: - ./autogen.sh @@ -54,8 +53,7 @@ script: - sed -i -e 's/ct:pal/ct:log/' test/suite.erl - ln -sf ../sql priv/ - escript ./rebar skip_deps=true ct -v - #- grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log - - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, 0 failed' logs/raw.log + - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log after_script: - find logs -name suite.log -exec cat '{}' ';' @@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do def project do [app: :ejabberd, - version: "16.02.0", + version: "16.03.0", description: description, elixir: "~> 1.2", elixirc_paths: ["lib"], diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl index 059938f5..18f52b48 100644 --- a/src/cyrsasl_scram.erl +++ b/src/cyrsasl_scram.erl @@ -159,7 +159,8 @@ mech_step(#state{step = 4} = State, ClientIn) -> ServerSignature = scram:server_signature(State#state.server_key, AuthMessage), - {ok, [{username, State#state.username}], + {ok, [{username, State#state.username}, + {authzid, State#state.username}], <<"v=", (jlib:encode_base64(ServerSignature))/binary>>}; true -> {error, <<"bad-auth">>, State#state.username} |