Skip to content
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

Jump to bottom

Escape HTML inn Process of creating patient to avoid XSS #208

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

Escape HTML inn Process of creating patient to avoid XSS #208

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
24 changes: 20 additions & 4 deletions omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.openmrs.validator.PatientIdentifierValidator;
import org.openmrs.validator.PatientValidator;
import org.openmrs.web.WebConstants;
import org.openmrs.web.WebUtil;
import org.openmrs.web.controller.person.PersonFormController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.propertyeditors.CustomDateEditor;
Expand Down Expand Up @@ -116,7 +117,7 @@ protected ModelAndView processFormSubmission(HttpServletRequest request, HttpSer
Object[] objs = null;

MessageSourceAccessor msa = getMessageSourceAccessor();
String action = request.getParameter("action");
String action = WebUtil.escapeHTML(request.getParameter("action"));

if (action.equals(msa.getMessage("Patient.save"))) {

Expand Down Expand Up @@ -150,10 +151,25 @@ protected ModelAndView processFormSubmission(HttpServletRequest request, HttpSer
String id = ids[i].trim();
if (!"".equals(id) && !"".equals(idTypes[i])) { //skips invalid and blank identifiers/identifierTypes
PatientIdentifier pi = new PatientIdentifier();
pi.setIdentifier(id);
pi.setIdentifierType(ps.getPatientIdentifierType(Integer.valueOf(idTypes[i])));
pi.setIdentifier(WebUtil.escapeHTML(id));
try {
int identifierTypeId = Integer.parseInt(idTypes[i]);
pi.setIdentifierType(ps.getPatientIdentifierType(identifierTypeId));
}
catch (NumberFormatException e) {
errors.rejectValue("identifierType", "Invalid identifier type format");
return showForm(request, response, errors);
}

if (StringUtils.isNotEmpty(locs[i])) {
pi.setLocation(ls.getLocation(Integer.valueOf(locs[i])));
try {
int locationId = Integer.parseInt(locs[i]);
pi.setLocation(ls.getLocation(locationId));
}
catch (NumberFormatException e) {
errors.rejectValue("location", "Invalid location format");
return showForm(request, response, errors);
}
}
if (idPrefStatus != null && idPrefStatus.length > i) {
pi.setPreferred(new Boolean(idPrefStatus[i]));
Expand Down
41 changes: 21 additions & 20 deletions omod/src/main/java/org/openmrs/web/controller/person/PersonFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.openmrs.util.OpenmrsConstants.PERSON_TYPE;
import org.openmrs.validator.PersonAddressValidator;
import org.openmrs.web.WebConstants;
import org.openmrs.web.WebUtil;
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.beans.propertyeditors.CustomNumberEditor;
import org.springframework.context.support.MessageSourceAccessor;
Expand Down Expand Up @@ -491,25 +492,25 @@ protected void updatePersonNames(HttpServletRequest request, Person person) {
pn.setPreferred(new Boolean(namePrefStatus[i]));
}
if (gNames.length >= i + 1) {
pn.setGivenName(gNames[i]);
pn.setGivenName(WebUtil.escapeHTML(gNames[i]));
}
if (mNames.length >= i + 1) {
pn.setMiddleName(mNames[i]);
pn.setMiddleName(WebUtil.escapeHTML(mNames[i]));
}
if (fNamePrefixes.length >= i + 1) {
pn.setFamilyNamePrefix(fNamePrefixes[i]);
pn.setFamilyNamePrefix(WebUtil.escapeHTML(fNamePrefixes[i]));
}
if (fNames.length >= i + 1) {
pn.setFamilyName(fNames[i]);
pn.setFamilyName(WebUtil.escapeHTML(fNames[i]));
}
if (fName2s.length >= i + 1) {
pn.setFamilyName2(fName2s[i]);
pn.setFamilyName2(WebUtil.escapeHTML(fName2s[i]));
}
if (fNameSuffixes.length >= i + 1) {
pn.setFamilyNameSuffix(fNameSuffixes[i]);
pn.setFamilyNameSuffix(WebUtil.escapeHTML(fNameSuffixes[i]));
}
if (degrees.length >= i + 1) {
pn.setDegree(degrees[i]);
pn.setDegree(WebUtil.escapeHTML(degrees[i]));
}
person.addName(pn);
}
Expand Down Expand Up @@ -615,46 +616,46 @@ protected void updatePersonAddresses(HttpServletRequest request, Person person,
for (int i = 0; i < maxAddrs; i++) {
PersonAddress pa = new PersonAddress();
if (add1s.length >= i + 1) {
pa.setAddress1(add1s[i]);
pa.setAddress1(WebUtil.escapeHTML(add1s[i]));
}
if (add2s.length >= i + 1) {
pa.setAddress2(add2s[i]);
pa.setAddress2(WebUtil.escapeHTML(add2s[i]));
}
if (cities.length >= i + 1) {
pa.setCityVillage(cities[i]);
pa.setCityVillage(WebUtil.escapeHTML(cities[i]));
}
if (states.length >= i + 1) {
pa.setStateProvince(states[i]);
pa.setStateProvince(WebUtil.escapeHTML(states[i]));
}
if (countries.length >= i + 1) {
pa.setCountry(countries[i]);
pa.setCountry(WebUtil.escapeHTML(countries[i]));
}
if (lats.length >= i + 1) {
pa.setLatitude(lats[i]);
pa.setLatitude(WebUtil.escapeHTML(lats[i]));
}
if (longs.length >= i + 1) {
pa.setLongitude(longs[i]);
pa.setLongitude(WebUtil.escapeHTML(longs[i]));
}
if (pCodes.length >= i + 1) {
pa.setPostalCode(pCodes[i]);
pa.setPostalCode(WebUtil.escapeHTML(pCodes[i]));
}
if (counties.length >= i + 1) {
pa.setCountyDistrict(counties[i]);
pa.setCountyDistrict(WebUtil.escapeHTML(counties[i]));
}
if (add3s.length >= i + 1) {
pa.setAddress3(add3s[i]);
pa.setAddress3(WebUtil.escapeHTML(add3s[i]));
}
if (addPrefStatus != null && addPrefStatus.length > i) {
pa.setPreferred(new Boolean(addPrefStatus[i]));
}
if (add6s.length >= i + 1) {
pa.setAddress6(add6s[i]);
pa.setAddress6(WebUtil.escapeHTML(add6s[i]));
}
if (add5s.length >= i + 1) {
pa.setAddress5(add5s[i]);
pa.setAddress5(WebUtil.escapeHTML(add5s[i]));
}
if (add4s.length >= i + 1) {
pa.setAddress4(add4s[i]);
pa.setAddress4(WebUtil.escapeHTML(add4s[i]));
}
if (startDates.length >= i + 1 && StringUtils.isNotBlank(startDates[i])) {
pa.setStartDate(Context.getDateFormat().parse(startDates[i]));
Expand Down
Loading