Skip to content

Commit cdafee4

Browse files
rmcdougarmcdouga
committed
✅ Updated WireMock mappings to match the response from AEM.
Originally, the code used an Adaptive Form recording, but when the TestContainers code was created, it used an HTML5 form instead. At that time, the WireMock recordings weren't updated so the WireMock tests still used the Adaptive Form. Now both WireMock and TestContainers tests use the same HTML5 form and so the same container image (running on port 4502) can be used to re-create the WireMock recordings.
1 parent f548ef7 commit cdafee4

10 files changed

+70
-150
lines changed

‎spring/fluentforms-sample-webmvc-app/src/main/java/com/_4point/aem/fluentforms/sampleapp/JerseyConfig.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockAemProxyEndpointTest.java‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@
33
import static com.github.tomakehurst.wiremock.client.WireMock.*;
44
import static org.junit.jupiter.api.Assertions.*;
55

6-
import java.nio.file.Path;
76
import java.util.List;
87
import java.util.concurrent.TimeUnit;
98

10-
import org.htmlunit.DefaultCredentialsProvider;
11-
import org.htmlunit.WebClient;
12-
import org.htmlunit.html.HtmlPage;
139
import org.junit.jupiter.api.AfterEach;
1410
import org.junit.jupiter.api.BeforeEach;
15-
import org.junit.jupiter.api.Disabled;
1611
import org.junit.jupiter.api.Test;
1712
import org.junit.jupiter.api.Timeout;
1813
import org.junit.jupiter.api.condition.EnabledIf;
@@ -42,11 +37,10 @@
4237
class WireMockAemProxyEndpointTest extends AbstractAemProxyEndpointTest {
4338
private static final boolean WIREMOCK_RECORDING = false;
4439

45-
private static final Path RESOURCES_DIR = Path.of("src", "test", "resources");
46-
private static final Path SAMPLE_FILES_DIR = RESOURCES_DIR.resolve("SampleFiles");
40+
private static final String CRX_CONTENT_ROOT = "crx:/content/dam/formsanddocuments/sample-forms/";
4741

4842
public WireMockAemProxyEndpointTest() {
49-
super(SAMPLE_FILES_DIR.resolve(SAMPLE_XDP_FILENAME_PATH).toAbsolutePath().toString());
43+
super(CRX_CONTENT_ROOT + SAMPLE_XDP_FILENAME_PATH);
5044
}
5145

5246
@BeforeEach
@@ -84,46 +78,4 @@ protected void verifyProxyTest() {
8478
)
8579
.forEach(url->verify(getRequestedFor(urlPathEqualTo(url))));
8680
}
87-
88-
89-
// In order to re-record the AEM interactions for Wiremock emulation, you need to:
90-
// 1) run a local AEM server
91-
// 2) set the WIREMOCK_RECORDING variable to true
92-
// 3) then run this test.
93-
//
94-
// It will record the interactions with the AEM server.
95-
// Don't forget to set the WIREMOCK_RECORDING variable back to false after you are done.
96-
//
97-
// Note: THe recordings may require modification. As of AEM 6.5 LTS, the required changes are:
98-
// * Two calls to /content/xfaforms/profiles/default.html - One returns a 401, the other returns the form.
99-
// This is because this HTMLUnit emulates a browser. The 401 recording can be deleted since the FluentForms code
100-
// sends a pre-emptive authentication header.
101-
// * the /etc.clientlibs/fd/xfaforms/clientlibs/I18N/en_US recording must be modified to make the _US optional.
102-
// It appears that the FluentForms call does not include the _US suffix.
103-
@Disabled("This test is not really a test but it is used to record interactions with the AEM server.")
104-
@Test
105-
void aemTest(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
106-
DefaultCredentialsProvider userCredentials = new DefaultCredentialsProvider();
107-
userCredentials.addCredentials("admin", "admin".toCharArray());
108-
try (final WebClient webClient = new WebClient()) {
109-
webClient.setCredentialsProvider(userCredentials);
110-
String baseUri = "http://localhost:" + wmRuntimeInfo.getHttpPort() + "/content/xfaforms/profiles/default.html?contentRoot=crx:///content/dam/formsanddocuments/sample-forms&template=SampleForm.xdp";
111-
final HtmlPage page = webClient.getPage(baseUri);
112-
assertEquals("LC Forms", page.getTitleText());
113-
114-
// final String pageAsXml = page.asXml();
115-
// assertTrue(pageAsXml.contains("<body class=\"topBarDisabled\">"), "Does not contain topBarDisabled");
116-
//
117-
// final String pageAsText = page.asNormalizedText();
118-
// assertTrue(pageAsText.contains("Support for the HTTP and HTTPS protocols"));
119-
}
120-
List.of("/content/xfaforms/profiles/default.html",
121-
"/etc.clientlibs/toggles.json",
122-
"/libs/granite/csrf/token.json",
123-
"/etc.clientlibs/fd/xfaforms/clientlibs/I18N/en_US.js",
124-
"/etc.clientlibs/fd/xfaforms/clientlibs/profile.css",
125-
"/etc.clientlibs/fd/xfaforms/clientlibs/profile.js"
126-
)
127-
.forEach(url->verify(getRequestedFor(urlPathEqualTo(url))));
128-
}
12981
}

‎spring/fluentforms-sample-webmvc-app/src/test/resources/mappings/AemProxyEndpointTest_proxyTest_content_xfaforms_profiles_default_html.json‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎spring/fluentforms-sample-webmvc-app/src/test/resources/mappings/AemProxyEndpointTest_proxyTest_etc.clientlibs_clientlibs_granite_jquery_granite_csrf_js.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
2-
"id" : "00a42460-ec46-4cee-94e6-33ea44869f87",
3-
"name" : "etc.clientlibs_clientlibs_granite_jquery_granite_csrf.js",
2+
"id" : "7a26c766-1d0f-4af8-a2a5-f1d5cd028f5d",
3+
"name" : "libs_granite_csrf_token.json",
44
"request" : {
5-
"url" : "/etc.clientlibs/clientlibs/granite/jquery/granite/csrf.js",
5+
"url" : "/libs/granite/csrf/token.json",
66
"method" : "GET"
77
},
88
"response" : {
99
"status" : 200,
10-
"base64Body" : "/*
 * ADOBE CONFIDENTIAL
 *
 * Copyright 2015 Adobe Systems Incorporated
 * All Rights Reserved.
 *
 * NOTICE:  All information contained herein is, and remains
 * the property of Adobe Systems Incorporated and its suppliers,
 * if any.  The intellectual and technical concepts contained
 * herein are proprietary to Adobe Systems Incorporated and its
 * suppliers and may be covered by U.S. and Foreign Patents,
 * patents in process, and are protected by trade secret or copyright law.
 * Dissemination of this information or reproduction of this material
 * is strictly forbidden unless prior written permission is obtained
 * from Adobe Systems Incorporated.
 *
 */
/* global CQURLInfo:false */
(function(window) {
    "use strict";

    window.Granite = window.Granite || {};
    window.Granite.HTTP = window.Granite.HTTP || {};

    var contextPath = null;

    function detectContextPath() {
        // eslint-disable-next-line max-len
        var SCRIPT_URL_REGEXP = /^(?:http|https):\/\/[^/]+(\/.*)\/(?:etc\.clientlibs|etc(\/.*)*\/clientlibs|libs(\/.*)*\/clientlibs|apps(\/.*)*\/clientlibs|etc\/designs).*\.js(\?.*)?$/;
        try {
            if (window.CQURLInfo) {
                contextPath = CQURLInfo.contextPath || "";
            } else {
                var scripts = document.getElementsByTagName("script");
                for (var i = 0; i < scripts.length; i++) {
                    var result = SCRIPT_URL_REGEXP.exec(scripts[i].src);
                    if (result) {
                        contextPath = result[1];
                        return;
                    }
                }
                contextPath = "";
            }
        } catch (e) {
            // ignored
        }
    }

    window.Granite.HTTP.externalize = window.Granite.HTTP.externalize || function(url) {
        if (contextPath === null) {
            detectContextPath();
        }

        try {
            if (url.indexOf("/") === 0 && contextPath && url.indexOf(contextPath + "/") !== 0) {
                url = contextPath + url;
            }
        } catch (e) {
            // ignored
        }

        return url;
    };
})(this);

/*
 * ADOBE CONFIDENTIAL
 *
 * Copyright 2015 Adobe Systems Incorporated
 * All Rights Reserved.
 *
 * NOTICE:  All information contained herein is, and remains
 * the property of Adobe Systems Incorporated and its suppliers,
 * if any.  The intellectual and technical concepts contained
 * herein are proprietary to Adobe Systems Incorporated and its
 * suppliers and may be covered by U.S. and Foreign Patents,
 * patents in process, and are protected by trade secret or copyright law.
 * Dissemination of this information or reproduction of this material
 * is strictly forbidden unless prior written permission is obtained
 * from Adobe Systems Incorporated.
 *
 */
(function(factory) {
    "use strict";

    // GRANITE-22281 Check for multiple initialization
    if (window.Granite.csrf) {
        return;
    }

    window.Granite.csrf = factory(window.Granite.HTTP);
}(function(http) {
    "use strict";

    // AdobePatentID="P5296"

    function Promise() {
        this._handler = [];
    }

    Promise.prototype = {
        then: function(resolveFn, rejectFn) {
            this._handler.push({ resolve: resolveFn, reject: rejectFn });
        },
        resolve: function() {
            this._execute("resolve", arguments);
        },
        reject: function() {
            this._execute("reject", arguments);
        },
        _execute: function(result, args) {
            if (this._handler === null) {
                throw new Error("Promise already completed.");
            }

            for (var i = 0, ln = this._handler.length; i < ln; i++) {
                this._handler[i][result].apply(window, args);
            }

            this.then = function(resolveFn, rejectFn) {
                (result === "resolve" ? resolveFn : rejectFn).apply(window, args);
            };

            this._handler = null;
        }
    };

    function verifySameOrigin(url) {
        // url could be relative or scheme relative or absolute
        // host + port
        var host = document.location.host;
        var protocol = document.location.protocol;
        var relativeOrigin = "//" + host;
        var origin = protocol + relativeOrigin;

        // Allow absolute or scheme relative URLs to same origin
        return (url === origin || url.slice(0, origin.length + 1) === origin + "/") ||
                (url === relativeOrigin || url.slice(0, relativeOrigin.length + 1) === relativeOrigin + "/") ||
                // or any other URL that isn't scheme relative or absolute i.e relative.
                !(/^(\/\/|http:|https:).*/.test(url));
    }

    var FIELD_NAME = ":cq_csrf_token";
    var HEADER_NAME = "CSRF-Token";
    var TOKEN_SERVLET = http.externalize("/libs/granite/csrf/token.json");

    var promise;
    var globalToken;

    function logFailRequest(error) {
        if (window.console) {
            // eslint-disable-next-line no-console
            console.warn("CSRF data not available;" +
                    "The data may be unavailable by design, such as during non-authenticated requests: " + error);
        }
    }

    function getToken() {
        var localPromise = new Promise();
        promise = localPromise;

        var xhr = new XMLHttpRequest();
        xhr.onreadystatechange = function() {
            if (xhr.readyState === 4) {
                try {
                    var data = JSON.parse(xhr.responseText);
                    globalToken = data.token;
                    localPromise.resolve(globalToken);
                } catch (ex) {
                    logFailRequest(ex);
                    localPromise.reject(xhr.responseText);
                }
            }
        };
        xhr.open("GET", TOKEN_SERVLET, true);
        xhr.send();

        return localPromise;
    }

    function getTokenSync() {
        var xhr = new XMLHttpRequest();
        xhr.open("GET", TOKEN_SERVLET, false);
        xhr.send();

        try {
            return globalToken = JSON.parse(xhr.responseText).token;
        } catch (ex) {
            logFailRequest(ex);
        }
    }

    function clearToken() {
        globalToken = undefined;
        getToken();
    }

    function addField(form) {
        var action = form.getAttribute("action");
        if (form.method.toUpperCase() === "GET" || (action && !verifySameOrigin(action))) {
            return;
        }

        if (!globalToken) {
            getTokenSync();
        }

        if (!globalToken) {
            return;
        }

        var input = form.querySelector('input[name="' + FIELD_NAME + '"]');

        if (!input) {
            input = document.createElement("input");
            input.setAttribute("type", "hidden");
            input.setAttribute("name", FIELD_NAME);
            form.appendChild(input);
        }

        input.setAttribute("value", globalToken);
    }

    function handleForm(document) {
        var handler = function(ev) {
            var t = ev.target;

            if (t.nodeName === "FORM") {
                addField(t);
            }
        };

        if (document.addEventListener) {
            document.addEventListener("submit", handler, true);
        } else if (document.attachEvent) {
            document.attachEvent("submit", handler);
        }
    }

    handleForm(document);

    var open = XMLHttpRequest.prototype.open;

    XMLHttpRequest.prototype.open = function(method, url, async) {
        if (method.toLowerCase() !== "get" && verifySameOrigin(url)) {
            this._csrf = true;
            this._async = async;
        }

        return open.apply(this, arguments);
    };

    var send = XMLHttpRequest.prototype.send;

    XMLHttpRequest.prototype.send = function() {
        if (!this._csrf) {
            send.apply(this, arguments);
            return;
        }

        if (globalToken) {
            this.setRequestHeader(HEADER_NAME, globalToken);
            send.apply(this, arguments);
            return;
        }

        if (this._async === false) {
            getTokenSync();

            if (globalToken) {
                this.setRequestHeader(HEADER_NAME, globalToken);
            }

            send.apply(this, arguments);
            return;
        }

        var self = this;
        var args = Array.prototype.slice.call(arguments);

        promise.then(function(token) {
            self.setRequestHeader(HEADER_NAME, token);
            send.apply(self, args);
        }, function() {
            send.apply(self, args);
        });
    };

    var submit = HTMLFormElement.prototype.submit;

    HTMLFormElement.prototype.submit = function() {
        addField(this);
        return submit.apply(this, arguments);
    };

    if (window.Node) {
        var ac = Node.prototype.appendChild;

        Node.prototype.appendChild = function() {
            var result = ac.apply(this, arguments);

            if (result.nodeName === "IFRAME") {
                try {
                    if (result.contentWindow && !result._csrf) {
                        result._csrf = true;
                        handleForm(result.contentWindow.document);
                    }
                } catch (ex) {
                    if (result.src && result.src.length && verifySameOrigin(result.src)) {
                        if (window.console) {
                            // eslint-disable-next-line no-console
                            console.error("Unable to attach CSRF token to an iframe element on the same origin");
                        }
                    }

                    // Potential error: Access is Denied
                    // we can safely ignore CORS security errors here
                    // because we do not want to expose the csrf anyways to another domain
                }
            }

            return result;
        };
    }

    // refreshing csrf token periodically
    getToken();

    setInterval(function() {
        getToken();
    }, 300000);

    return {
        initialised: false,
        refreshToken: getToken,
        _clearToken: clearToken
    };
}));

",
10+
"body" : "{\"token\":\"eyJleHAiOjE3NjMzMDM3OTQsImlhdCI6MTc2MzMwMzE5NH0.5v2R_70ZbNN7EUoVwrGql7hk1EBeJ2FepXfNUxQJkg8\"}",
1111
"headers" : {
12+
"Cache-Control" : "no-cache",
1213
"X-Content-Type-Options" : "nosniff",
13-
"Last-Modified" : "Sat, 03 May 2025 13:47:20 GMT",
14-
"Date" : "Sun, 11 May 2025 11:23:44 GMT",
15-
"Content-Type" : "application/javascript;charset=utf-8"
14+
"Expires" : "-1",
15+
"Date" : "Sun, 16 Nov 2025 14:26:34 GMT",
16+
"Content-Type" : "application/json"
1617
}
1718
},
18-
"uuid" : "00a42460-ec46-4cee-94e6-33ea44869f87",
19+
"uuid" : "7a26c766-1d0f-4af8-a2a5-f1d5cd028f5d",
1920
"persistent" : true,
20-
"insertionIndex" : 20
21+
"insertionIndex" : 31
2122
}

0 commit comments

Comments
 (0)