You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/10/24 11:03:53 UTC
[sling-org-apache-sling-scripting-sightly-testing-content] branch master updated: SLING-11538 add test content for display context "jsonString" (#7)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing-content.git
The following commit(s) were added to refs/heads/master by this push:
new 99729b8 SLING-11538 add test content for display context "jsonString" (#7)
99729b8 is described below
commit 99729b8a62f86fd663e989a19a5a5f4c37162c8d
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Oct 24 13:03:48 2022 +0200
SLING-11538 add test content for display context "jsonString" (#7)
---
.../models/{package-info.java => FaqModel.java} | 19 ++++++++--
.../sightly/testing/models/package-info.java | 2 +-
.../SLING-INF/apps/sightly/scripts/xss/xss.html | 40 ++++++++++++++++++++++
src/main/resources/SLING-INF/content/sightly.json | 4 +++
4 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/testing/models/FaqModel.java
similarity index 73%
copy from src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java
copy to src/main/java/org/apache/sling/scripting/sightly/testing/models/FaqModel.java
index f9048a2..f146194 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/testing/models/FaqModel.java
@@ -14,8 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
******************************************************************************/
-
-@Version("1.4.0")
package org.apache.sling.scripting.sightly.testing.models;
-import org.osgi.annotation.versioning.Version;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Model;
+
+@Model(adaptables = Resource.class)
+public class FaqModel {
+
+
+ public String getQuestion() {
+ return "Some question with special character \"\':\t"; // some invalid characters in JSON
+ }
+
+ public String getAnswer() {
+ return "42";
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java
index f9048a2..53661e9 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/testing/models/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
******************************************************************************/
-@Version("1.4.0")
+@Version("1.5.0")
package org.apache.sling.scripting.sightly.testing.models;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/resources/SLING-INF/apps/sightly/scripts/xss/xss.html b/src/main/resources/SLING-INF/apps/sightly/scripts/xss/xss.html
new file mode 100644
index 0000000..1a77773
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/sightly/scripts/xss/xss.html
@@ -0,0 +1,40 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ 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.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+<html data-sly-use.faq="org.apache.sling.scripting.sightly.testing.models.FaqModel">
+<head>
+<!-- follows schema from https://developers.google.com/search/docs/appearance/structured-data/faqpage -->
+<script type="application/ld+json">{
+ "@context":"https://schema.org",
+ "@type":"FAQPage",
+ "mainEntity":[
+ {
+ "@type":"Question",
+ "name":"${faq.question @ context='jsonString'}"
+ "acceptedAnswer":{
+ "@type":"Answer",
+ "text":"${faq.answer @ context='jsonString'}"
+ }
+ }
+ ]
+}
+</script>
+</head>
+<body>
+ <h1>Question: ${faq.question}</h1>
+ <p>${faq.answer}</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/content/sightly.json b/src/main/resources/SLING-INF/content/sightly.json
index fbab8f4..5f89ad2 100644
--- a/src/main/resources/SLING-INF/content/sightly.json
+++ b/src/main/resources/SLING-INF/content/sightly.json
@@ -79,6 +79,10 @@
"inherit": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sightly/scripts/inherit"
+ },
+ "xss": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType" : "/apps/sightly/scripts/xss"
}
}