Skip to content

Fixes #60 Handle whitelist AccessModels #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashward merged 1 commit into from
Aug 30, 2013
Merged

Fixes #60 Handle whitelist AccessModels #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/org/buddycloud/channelserver/pubsub/accessmodel/AccessModels.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static AccessModels createFromString(String asString) {
} else if ("whitelist".equals(asString)) {
return whitelist;
}
return whitelist;
return authorize;
}

}
11 changes: 9 additions & 2 deletions src/main/java/org/buddycloud/channelserver/utils/node/NodeViewAcl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,18 @@ public boolean canViewNode(String node, Affiliations affilliation,
return openChannelAcl(node, subscription, affilliation);
} else if (accessModel.toString().equals(AccessModels.authorize.toString())) {
return privateChannelAcl(node, subscription, affilliation);
}
} else if (accessModel.toString().equals(AccessModels.whitelist.toString())) {
return whitelistAcl(node, subscription, affilliation);
}
throw new InvalidParameterException(INVALID_ACCESS_MODEL);
}

private boolean privateChannelAcl(String node, Subscriptions subscription,
private boolean whitelistAcl(String node, Subscriptions subscription, Affiliations affilliation) {
LOGGER.trace("Whitelist not implemented, returning equivalent of authorized");
return privateChannelAcl(node, subscription, affilliation);
}

private boolean privateChannelAcl(String node, Subscriptions subscription,
Affiliations affilliation) {
if (Subscriptions.none.toString().equals(subscription.toString())) {
reasonForRefusal = new NodeAclRefuseReason(PacketError.Type.auth,
Expand Down