Skip to content

Feature/restrict image types #106

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
guidotrueb wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/restrict image types #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e18f4e6
Add restriction on image MIME types for both pictures and logo.
guidotrueb Sep 20, 2019
fbe541e
Bump major version since this is a breaking retro-compatibility change.
guidotrueb Sep 20, 2019
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 package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swissrets",
"version": "2.0.0",
"version": "3.0.0",
"description": "A swiss real estate transfer standard.",
"directories": {
"doc": "docs"
Expand Down
18 changes: 16 additions & 2 deletions schema/schema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,14 @@
<xs:element type="xs:anyURI" name="url" maxOccurs="1" minOccurs="1" />
<xs:element type="xs:string" name="title" maxOccurs="1" minOccurs="0" />
<xs:element type="xs:string" name="description" maxOccurs="1" minOccurs="0" />
<xs:element type="mimeType" name="mimeType" maxOccurs="1" minOccurs="0" />
<xs:element name="mimeType" maxOccurs="1" minOccurs="0">
<xs:simpleType>
<xs:restriction base="mimeType">
<xs:enumeration value="image/jpeg" />
<xs:enumeration value="image/png" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
Expand All @@ -1440,7 +1447,14 @@
<xs:complexType>
<xs:all maxOccurs="1" minOccurs="1">
<xs:element type="xs:anyURI" name="url" maxOccurs="1" minOccurs="1" />
<xs:element type="mimeType" name="mimeType" maxOccurs="1" minOccurs="0" />
<xs:element name="mimeType" maxOccurs="1" minOccurs="0">
<xs:simpleType>
<xs:restriction base="mimeType">
<xs:enumeration value="image/jpeg" />
<xs:enumeration value="image/png" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
Expand Down
4 changes: 4 additions & 0 deletions scripts/tests/Schema_should.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ public void should_fail()
@"utilizations-empty.xml", 1,
"The element 'utilizations' has incomplete content."
);
this.validate(
@"image-mimeType-invalid.xml", 2,
"The 'mimeType' element is invalid - The value 'image/svg+xml' is invalid according to its datatype 'String' - The Enumeration constraint failed."
);
}

#region validate
Expand Down
27 changes: 27 additions & 0 deletions scripts/tests/should-fail/image-mimeType-invalid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<export xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://swissrets.ch/dist/v2.0.0/schema.xsd">
<properties>
<property id="1245687">
<referenceId>LA-644238</referenceId>
<availability>active</availability>
<type>rent</type>
<localizations>
<localization lang="en">
<name>Calm and beautiful flat</name>
<attachments>
<image>
<url>http://www.someorg.com/dg546jdl</url>
<title>The living room</title>
<description>The living is very nice</description>
<mimeType>image/svg+xml</mimeType>
</image>
<logo>
<url>http://www.someorg.com/dg546jdl</url>
<mimeType>image/ico</mimeType>
</logo>
</attachments>
</localization>
</localizations>
</property>
</properties>
</export>