File size: 3,258 Bytes
eb67da4 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 |
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); <br>
* you may not use this file except in compliance with the License.<br>
* You may obtain a copy of the License at the
* <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
* <p>
* Unless required by applicable law or agreed to in writing,<br>
* software distributed under the License is distributed on an "AS IS" BASIS, <br>
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
* See the License for the specific language governing permissions and <br>
* limitations under the License.
* <p>
* Initial code contributed and copyrighted by<br>
* frentix GmbH, http://www.frentix.com
* <p>
*/
package org.olat.modules.ceditor;
import org.olat.core.util.xml.XStreamHelper;
import org.olat.modules.ceditor.model.ContainerColumn;
import org.olat.modules.ceditor.model.ContainerSettings;
import org.olat.modules.ceditor.model.ImageHorizontalAlignment;
import org.olat.modules.ceditor.model.ImageSettings;
import org.olat.modules.ceditor.model.ImageSize;
import org.olat.modules.ceditor.model.ImageTitlePosition;
import org.olat.modules.ceditor.model.TableColumn;
import org.olat.modules.ceditor.model.TableContent;
import org.olat.modules.ceditor.model.TableRow;
import org.olat.modules.ceditor.model.TableSettings;
import org.olat.modules.ceditor.model.TextSettings;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.security.ExplicitTypePermission;
/**
* The XStream has its security features enabled.
*
* Initial date: 5 sept. 2018<br>
* @author srosse, [email protected], http://www.frentix.com
*
*/
public class ContentEditorXStream {
private static final XStream xstream = XStreamHelper.createXStreamInstance();
static {
Class<?>[] types = new Class[] {
ImageSettings.class, ImageHorizontalAlignment.class, ImageTitlePosition.class, ImageSize.class,
TextSettings.class, ContainerSettings.class, ContainerColumn.class,
TableContent.class, TableRow.class, TableColumn.class, TableSettings.class
};
// BUG: CWE-91 XML Injection (aka Blind XPath Injection)
// XStream.setupDefaultSecurity(xstream);
// FIXED:
xstream.addPermission(new ExplicitTypePermission(types));
xstream.alias("imagesettings", ImageSettings.class);
xstream.alias("imagehorizontalalignment", ImageHorizontalAlignment.class);
xstream.alias("imagetitleposition", ImageTitlePosition.class);
xstream.alias("imagesize", ImageSize.class);
xstream.alias("textsettings", TextSettings.class);
xstream.alias("containersettings", ContainerSettings.class);
xstream.alias("containercolumn", ContainerColumn.class);
xstream.alias("tablecontent", TableContent.class);
xstream.alias("tablerow", TableRow.class);
xstream.alias("tablecolumn", TableColumn.class);
xstream.alias("tablesettings", TableSettings.class);
}
public static String toXml(Object obj) {
return xstream.toXML(obj);
}
@SuppressWarnings("unchecked")
public static <U> U fromXml(String xml, @SuppressWarnings("unused") Class<U> cl) {
Object obj = xstream.fromXML(xml);
return (U)obj;
}
}
|