Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7b1aded
Merge remote-tracking branch 'upstream/master'
ddhuy Nov 18, 2017
7817195
Merge remote-tracking branch 'upstream/master'
ddhuy Nov 21, 2017
c61b64d
Merge remote-tracking branch 'upstream/master'
ddhuy Nov 24, 2017
b007c24
Merge remote-tracking branch 'upstream/master'
ddhuy Nov 29, 2017
ca8f4e2
scripts & configurations for easy compile/run
ddhuy Nov 30, 2017
17726a7
Merge remote-tracking branch 'upstream/master'
ddhuy Nov 30, 2017
0a4efd6
fix rc start
ddhuy Nov 30, 2017
390dfc3
Merge remote-tracking branch 'upstream/master'
ddhuy Dec 2, 2017
4fc69f9
Merge remote-tracking branch 'upstream/master'
ddhuy Dec 5, 2017
1312f2b
fix 2497: suspend account
ddhuy Dec 5, 2017
c846a5e
Merge remote-tracking branch 'upstream/master'
ddhuy Dec 6, 2017
e453ca1
change release version
ddhuy Dec 6, 2017
d284f95
add regression tests
ddhuy Jan 17, 2018
b775cf6
Merge branch 'master' of https://github.com/RestComm/Restcomm-Connect
ddhuy Jan 18, 2018
a880b53
Merge remote-tracking branch 'upstream/master'
ddhuy Jan 21, 2018
daff37d
Merge remote-tracking branch 'upstream/master'
ddhuy Jan 22, 2018
26f6e9a
Merge remote-tracking branch 'upstream/master'
ddhuy Feb 13, 2018
dd07849
Merge remote-tracking branch 'upstream/master'
ddhuy Mar 1, 2018
7ba20ce
change sql authentication in configuration
ddhuy Mar 8, 2018
16409d5
Merge remote-tracking branch 'upstream/master'
ddhuy Mar 8, 2018
5f59c31
Merge branch 'master' of github.com:RestComm/Restcomm-Connect
ddhuy Mar 10, 2018
bfea85d
Merge remote-tracking branch 'upstream/master'
ddhuy Mar 21, 2018
3ec2d3c
Merge remote-tracking branch 'upstream/master'
ddhuy Mar 22, 2018
3a54d85
Merge remote-tracking branch 'upstream/master'
ddhuy Mar 23, 2018
5d17278
Merge remote-tracking branch 'upstream/master'
ddhuy Mar 30, 2018
4ff436f
Merge remote-tracking branch 'upstream/master'
ddhuy Apr 6, 2018
72e2ea2
fix suspend account & add regression tests
ddhuy Apr 7, 2018
2fef8bd
Merge branch 'issue_2497_ddhuy' of github.com:ddhuy/Restcomm-Connect …
ddhuy Apr 7, 2018
731b99a
fix merging issues
ddhuy Apr 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,21 @@ protected void init(final Configuration configuration) {
* Grants general purpose access if any valid token exists in the request
*/
protected void checkAuthenticatedAccount() {
if (userIdentityContext.getEffectiveAccount() == null) {
Account account = userIdentityContext.getEffectiveAccount();
if (account == null) {
throw new NotAuthenticated();
}
Account.Status accountStatus = account.getStatus();
if (accountStatus != Account.Status.ACTIVE && accountStatus != Account.Status.UNINITIALIZED) {
throw new AuthorizationException();
}
Sid parentSid = account.getParentSid();
if (parentSid != null) {
Account parentAccount = this.accountsDao.getAccount(parentSid);
if (parentAccount.getStatus() != Account.Status.ACTIVE) {
throw new AuthorizationException();
}
}
}

/**
Expand Down