Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -28,9 +28,12 @@
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.core.RollerContext;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.xmlrpc.common.XmlRpcNotAuthorizedException;
Expand Down Expand Up @@ -102,97 +105,133 @@ public BaseAPIHandler() {

//------------------------------------------------------------------------
/**
* Returns website, but only if user authenticates and is authorized to edit.
* @param blogid Blogid sent in request (used as website's handle)
* Returns a weblog only when the authenticated user has the requested
* permission and XML-RPC access is enabled for that weblog.
*/
protected Weblog validate(String blogid, String username, String password,
String requiredAction) throws Exception {
User user = validateUser(username, password);
return validateWeblog(blogid, user, requiredAction);
}

/**
* Validate a weblog for an already authenticated user.
*/
protected Weblog validateWeblog(String blogid, User user,
String requiredAction) throws Exception {
try {
WeblogManager weblogMgr = WebloggerFactory.getWeblogger()
.getWeblogManager();
Weblog website = weblogMgr.getWeblogByHandle(blogid);

// Use one response for missing, unavailable, and inaccessible weblogs.
if (!isWeblogAvailable(website)
|| !website.hasUserPermission(user, requiredAction)) {
throw new XmlRpcNotAuthorizedException(WEBLOG_DISABLED_MSG);
}
return website;
} catch (XmlRpcNotAuthorizedException e) {
throw e;
} catch (Exception e) {
mLogger.error("ERROR internal error validating weblog", e);
throw new XmlRpcNotAuthorizedException(WEBLOG_DISABLED_MSG);
}
}

//------------------------------------------------------------------------
/**
* Returns the authenticated user if username/password are valid and the
* user is not disabled.
* @param username Username sent in request
* @param password Password sent in request
*/
protected Weblog validate(String blogid, String username, String password)
throws Exception {
protected User validateUser(String username, String password)
throws Exception {
User user = null;
boolean authenticated = false;
boolean userEnabled = false;
boolean weblogEnabled = false;
boolean apiEnabled = false;
boolean weblogFound = false;
Weblog website = null;
try {
UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
WeblogManager weblogMgr = WebloggerFactory.getWeblogger().getWeblogManager();
User user = userMgr.getUserByUserName(username);

website = weblogMgr.getWeblogByHandle(blogid);
if (website != null) {
weblogFound = true;
weblogEnabled = website.getVisible();
apiEnabled = website.getEnableBloggerApi()
&& WebloggerRuntimeConfig.getBooleanProperty("webservices.enableXmlRpc");
}

if (user != null) {
userEnabled = user.getEnabled();
authenticated = RollerContext.getPasswordEncoder().matches(password, user.getPassword());
user = userMgr.getUserByUserName(username);
if (user != null && RollerContext.getPasswordEncoder() != null) {
authenticated = RollerContext.getPasswordEncoder().matches(
password, user.getPassword());
}
} catch (Exception e) {
mLogger.error("ERROR internal error validating user", e);
}
if ( !authenticated ) {

if (!authenticated) {
throw new XmlRpcNotAuthorizedException(AUTHORIZATION_EXCEPTION_MSG);
}
if ( !userEnabled ) {

if (!Boolean.TRUE.equals(user.getEnabled())) {
throw new XmlRpcNotAuthorizedException(USER_DISABLED_MSG);
}
if ( !weblogEnabled ) {
throw new XmlRpcNotAuthorizedException(WEBLOG_DISABLED_MSG);

if (!WebloggerRuntimeConfig.getBooleanProperty("webservices.enableXmlRpc")) {
throw new XmlRpcNotAuthorizedException(BLOGGERAPI_DISABLED_MSG);
}
if ( !weblogFound ) {
throw new XmlRpcException(WEBLOG_NOT_FOUND, WEBLOG_NOT_FOUND_MSG);

return user;
}

/**
* Returns an entry only when it belongs to an available XML-RPC weblog and
* the user may edit it. An optional additional weblog action can be
* required for transitions such as publishing.
*/
protected WeblogEntry validateEntry(String postid, User user,
String additionalAction) throws Exception {
WeblogEntry entry = getEntryForWrite(postid, user);
if (entry == null) {
throw new XmlRpcException(INVALID_POSTID, INVALID_POSTID_MSG);
}
if ( !apiEnabled ) {
throw new XmlRpcNotAuthorizedException(BLOGGERAPI_DISABLED_MSG);
if (additionalAction != null) {
try {
if (!entry.getWebsite().hasUserPermission(user, additionalAction)) {
throw new XmlRpcNotAuthorizedException(
AUTHORIZATION_EXCEPTION_MSG);
}
} catch (XmlRpcNotAuthorizedException e) {
throw e;
} catch (Exception e) {
mLogger.error("ERROR internal error validating entry action", e);
throw new XmlRpcNotAuthorizedException(
AUTHORIZATION_EXCEPTION_MSG);
}
}
return website;
return entry;
}

//------------------------------------------------------------------------

/**
* Returns true if username/password are valid and user is not disabled.
* @param username Username sent in request
* @param password Password sent in request
* Nullable form used by Blogger.deletePost(), whose public contract
* returns false when the entry is unavailable.
*/
protected boolean validateUser(String username, String password)
throws Exception {
boolean authenticated = false;
boolean enabled = false;
boolean apiEnabled = false;
protected WeblogEntry getEntryForWrite(String postid, User user)
throws Exception {
try {

UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
User user = userMgr.getUserByUserName(username);

if (user != null) {
enabled = user.getEnabled();
authenticated = RollerContext.getPasswordEncoder().matches(password, user.getPassword());

apiEnabled = WebloggerRuntimeConfig.getBooleanProperty("webservices.enableXmlRpc");
WeblogEntryManager entryMgr = WebloggerFactory.getWeblogger()
.getWeblogEntryManager();
WeblogEntry entry = entryMgr.getWeblogEntry(postid);
if (entry == null || !isWeblogAvailable(entry.getWebsite())
|| !entry.getWebsite().hasUserPermission(
user, WeblogPermission.EDIT_DRAFT)
|| !entry.hasWritePermissions(user)) {
return null;
}
return entry;
} catch (Exception e) {
mLogger.error("ERROR internal error validating user", e);
}

if ( !authenticated ) {
mLogger.error("ERROR internal error validating weblog entry", e);
throw new XmlRpcNotAuthorizedException(AUTHORIZATION_EXCEPTION_MSG);
}

if ( !enabled ) {
throw new XmlRpcNotAuthorizedException(USER_DISABLED_MSG);
}

private boolean isWeblogAvailable(Weblog website) {
if (website == null) {
return false;
}

if ( !apiEnabled ) {
throw new XmlRpcNotAuthorizedException(BLOGGERAPI_DISABLED_MSG);
}

return authenticated;
return Boolean.TRUE.equals(website.getVisible())
&& Boolean.TRUE.equals(website.getEnableBloggerApi());
}

//------------------------------------------------------------------------
Expand Down
Loading
Loading