Skip to content

Fix SQL injection vulnerability for DatabaseCookieAuthenticatorAction. #32

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

Open
jpuerto wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix SQL injection vulnerability for DatabaseCookieAuthenticatorAction. #32

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
50 changes: 29 additions & 21 deletions ...abases-impl/src/main/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -17,6 +17,7 @@
package org.apache.cocoon.acting;

import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Collections;
Expand Down Expand Up @@ -89,7 +90,7 @@ public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
throws Exception {
DataSourceComponent datasource = null;
Connection conn = null;
Statement st = null;
PreparedStatement st = null;
ResultSet rs = null;

// read global parameter settings
Expand Down Expand Up @@ -129,20 +130,16 @@ public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
return null;
}

String query = this.getAuthQuery(objectModel, conf, req);
if (query == null) {
st = this.getAuthQuery(objectModel, conf, conn);
if (st == null) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("DBCOOKIEAUTH: have not got query");
}
req.setAttribute("message", "The authenticator is misconfigured");
return null;
}

if (getLogger().isDebugEnabled()) {
getLogger().debug("DBCOOKIEAUTH: query is: " + query);
}
st = conn.createStatement();
rs = st.executeQuery(query);
rs = st.executeQuery();

if (rs.next()) {
if (getLogger().isDebugEnabled()) {
Expand Down Expand Up @@ -231,11 +228,10 @@ public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
*
* @param objectModel Description of Parameter
* @param conf Description of Parameter
* @param req Description of Parameter
* @param conn Description of Parameter
* @return The authQuery value
*/
private String getAuthQuery(Map objectModel, Configuration conf, Request req) {
boolean first_constraint = true;
private PreparedStatement getAuthQuery(Map objectModel, Configuration conf, Connection conn) {
StringBuffer queryBuffer = new StringBuffer("SELECT ");
StringBuffer queryBufferEnd = new StringBuffer("");
String dbcol;
Expand All @@ -246,6 +242,8 @@ private String getAuthQuery(Map objectModel, Configuration conf, Request req) {
Configuration table = conf.getChild("table");
Configuration[] select = table.getChildren("select");
try {
Object[] constraintValues = new Object[select.length];
int constraints = 0;
for (int i = 0; i < select.length; i++) {
if (i != 0) {
queryBuffer.append(", ");
Expand Down Expand Up @@ -277,29 +275,39 @@ private String getAuthQuery(Map objectModel, Configuration conf, Request req) {
return null;
}
} else {
if (!first_constraint) {
if (constraints > 0) {
queryBufferEnd.append(" AND ");
}
queryBufferEnd.append(dbcol + "='" + cookie_value + "'");
first_constraint = false;
queryBufferEnd.append(dbcol + "= ?");
constraintValues[constraints++] = cookie_value;
}
}
queryBuffer.append(" FROM ");
queryBuffer.append(table.getAttribute("name"));
if (!queryBufferEnd.toString().trim().equals("")) {
queryBuffer.append(" WHERE ").append(queryBufferEnd);
}
return queryBuffer.toString();

getLogger().debug("DBCOOKIEAUTH: query " + queryBuffer);

PreparedStatement st = conn.prepareStatement(queryBuffer.toString());

for (int i = 0; i < constraints; i++) {
getLogger().debug("DBCOOKIEAUTH: parameter " + (i+1) + " = [" + constraintValues[i] + "]");
st.setObject(i+1,constraintValues[i]);
}

return st;
} catch (Exception e) {
getLogger().error("Exception: ",e);
return null;
}
}

public static Cookie getCookie(Map objectModel, String cookieName) {

Request request = ObjectModelHelper.getRequest(objectModel);

Cookie[] cookies = request.getCocoonCookies();
if (cookies != null) {
for(int count = 0; count < cookies.length; count++) {
Expand All @@ -309,7 +317,7 @@ public static Cookie getCookie(Map objectModel, String cookieName) {
}
}
}

return null;
}
/**
Expand Down Expand Up @@ -340,7 +348,7 @@ private HashMap propagateParameters(Configuration conf, ResultSet rs,
String type = select[i].getAttribute("type", "");
// "string" is the default type
if (StringUtils.isEmpty(type.trim()) || "string".equals(type)) {
o = s;
o = s;
} else if ("long".equals(type)) {
Long l = Long.decode(s);
o = l;
Expand Down