fix: encoding of urls

Author: remy

components/Check.vue

@@ -56,21 +56,23 @@
 const API = ""; //"https://wm.rem.now.sh/api"; //process.env.API;
 export default {
   props: {
-    url: String,
+    query: String
+  },
+  data: function () {
+    return {
+      url: this.query,
+      loading: false,
+      mentions: [],
+      sent: false,
+      hasResult: false,
+      error: null
+    };
   },
-  data: () => ({
-    // url: "",
-    loading: false,
-    mentions: [],
-    sent: false,
-    hasResult: false,
-    error: null
-  }),
   methods: {
     async sendMentions(event) {
       event.preventDefault();
       this.loading = true;
-      const res = await fetch(`${API}/check/?url=${escape(this.url)}`, {
+      const res = await fetch(`${API}/check/?url=${encodeURIComponent(this.url)}`, {
         method: "post"
       });
       this.loading = false;
@@ -91,7 +93,7 @@ export default {
       this.hasResult = false;
       this.error = null;
       this.mentions = [];
-      const res = await fetch(`${API}/check/?url=${escape(this.url)}`);
+      const res = await fetch(`${API}/check/?url=${encodeURIComponent(this.url)}`);
 
       if (res.status === 200) {
         const json = await res.json();
@@ -110,7 +112,9 @@ export default {
         } catch (e) {
           console.log(e);
 
-          this.error = 'Something went wrong trying to capture the contents of the check request. Please try again or please report this error with the URL you are testing - thank you\n\n' + e;
+          this.error =
+            "Something went wrong trying to capture the contents of the check request: " +
+            e;
         }
       }
     }

lib/query-string.js

@@ -1,4 +1,8 @@
 const url = require('url');
 const qsParser = require('querystring').parse;
+const decodeUriComponent = require('decodeuricomponent');
 
-module.exports = req => qsParser(url.parse(req.url).query);
+module.exports = req =>
+  qsParser(url.parse(req.url).query, null, null, {
+    decodeURIComponent: decodeUriComponent,
+  });

package-lock.json

@@ -35,6 +35,7 @@
     "cheerio": "0.22.0",
     "clui": "^0.3.6",
     "cookie-universal-nuxt": "^2.0.14",
+    "decodeuricomponent": "^0.3.1",
     "follow-redirects": "^1.7.0",
     "googleapis": "^40.0.0",
     "li": "^1.3.0",

package.json

@@ -1,14 +1,14 @@
 <template lang="md">
 # TODO
 
-- [ ] Support proper host encoding, so https://i❤️.ws works
 - [ ] Allow self mentions & pings
 - [ ] Provide `require('@remy/webmention')` support
 - [ ] Support JSON feed (if there's requests for it)
 - [ ] Support other sign in methods, such as indieauth
 
 ## As of v1.3.1 / 2019-06-13
 
+- [x] Support proper host encoding, so https://i❤️.ws works
 - [x] If both pingback & webmention found, prioritise webmention
 - [x] Support nested `h-entry` (such as nested in `h-feed`s)
 

pages/docs/todo.vue

@@ -2,27 +2,20 @@
   <div>
     <h1>Test and send webmentions</h1>
     <p>Keep in mind that this test page only scans the 10 most recent <code>h-entry</code> elements on the target.</p>
-    <Check :url="url"/>
+    <Check v-bind:query="url"/>
   </div>
 </template>
 
 <script>
 import Check from "../components/Check";
 export default {
   data() {
-    return {
-      url: ''
-    }
+    return { url: '' }
   },
-  components: { Check },
-  mounted() {
-    if (window.location.search) {
-      try {
-        const q = new URLSearchParams(window.location.search);
-        this.url = q.get("url") || ""
-      } catch (e) {}
-    }
-  }
+  asyncData ({ query } = {}) {
+    return query;
+  },
+  components: { Check }
 };
 </script>
 

pages/test.vue

@@ -3,6 +3,7 @@ const Webmention = require('../lib/webmention');
 const sendMention = require('../lib/send');
 const db = require('../lib/db');
 const ms = require('ms');
+const parse = require('url').parse;
 
 const rateWindow = 1000 * 60; // * 60 * 4; // 4 hours
 
@@ -32,6 +33,9 @@ module.exports = async (req, res) => {
     url = `http://${url}`;
   }
 
+  // ensure the url is properly encoded
+  url = parse(url).href;
+
   const { origin = '', referer = '' } = req.headers;
 
   if (