feat: add package for getting the full URL from a request

docs/request-url.md

@@ -0,0 +1,85 @@
+---
+title: Get Request URL
+---
+
+A small utility to get the original URL that a request was made with. e.g. if your user types `http://example.com/foo/bar` into the address bar, and it loads the web page on your server, this should return `http://example.com/foo/bar`.
+
+## Installation
+
+To install, run the following command in your terminal:
+
+```
+yarn add @authentication/request-url
+```
+
+## Usage
+
+Calling `getRequestURL` with either an express request or koa context returns the `URL` object representing the full URL that the visitor navigated to in order to load the page.
+
+```typescript
+import getRequestURL from '@authentication/cloudflare-ip';
+import express from 'express';
+
+const app = express();
+
+app.use((req, res) => {
+  res.send(`The URL you requested is: ${getRequestURL(req).href}`);
+});
+
+app.listen(process.env.PORT || 3000);
+```
+
+```javascript
+const getRequestURL = require('@authentication/cloudflare-ip');
+const express = require('express');
+
+const app = express();
+
+app.use((req, res) => {
+  res.send(`The URL you requested is: ${getRequestURL(req).href}`);
+});
+
+app.listen(process.env.PORT || 3000);
+```
+
+### Trust Proxy
+
+If you run your app behind a proxy in production, you will also need to pass `{trustProxy: true}`. `trustProxy` is enabled by default if `NODE_ENV=development` to make it easier to use `getRequestURL` with setups like webpack-dev-server.
+
+**N.B.** If a malicious user finds a way to bypass the proxy, or if the proxy does not overwrite the `x-forwarded-host` and `x-forwarded-proto` headers, it may be possible for a malicous attacker to force this function to return a URL for a server you do not control.
+
+### Base URL
+
+Instead of setting `trustProxy`, if you know the host name you expect your app to be running on, you should set the `baseURL` option. This is much more secure. You can use an environment variable to support different values between development, staging and production:
+
+```typescript
+import getRequestURL from '@authentication/cloudflare-ip';
+import express from 'express';
+
+const app = express();
+
+app.use((req, res) => {
+  res.send(`The URL you requested is: ${getRequestURL(req, {
+    // set this variable to something like: https://www.example.com
+    baseURL: process.env.BASE_URL,
+  }).href}`);
+});
+
+app.listen(process.env.PORT || 3000);
+```
+
+```javascript
+const getRequestURL = require('@authentication/cloudflare-ip');
+const express = require('express');
+
+const app = express();
+
+app.use((req, res) => {
+  res.send(`The URL you requested is: ${getRequestURL(req, {
+    // set this variable to something like: https://www.example.com
+    baseURL: process.env.BASE_URL,
+  }).href}`);
+});
+
+app.listen(process.env.PORT || 3000);
+```

packages/oauth1/src/index.ts

@@ -4,7 +4,7 @@ import Cookie from '@authentication/cookie';
 import {Mixed} from '@authentication/types';
 import AuthorizationError from './errors/AuthorizationError';
 import StateVerificationFailure from './errors/StateVerificationFailure';
-import originalURL from './originalURL';
+import getRequestURL from '@authentication/request-url';
 const OAuth1Base = require('oauth').OAuth;
 
 function parseURL(name: string, input: URL | string, base?: string | URL) {
@@ -239,7 +239,14 @@ export default class OAuth1Authentication<State = Mixed> {
       typeof callbackURLInitial === 'string'
         ? new URL(
             callbackURLInitial,
-            originalURL(req, {trustProxy: this._trustProxy}),
+            getRequestURL(req, {
+              trustProxy:
+                this._trustProxy === undefined
+                  ? req.app.get('trust proxy') ||
+                    process.env.NODE_ENV === 'development'
+                  : this._trustProxy,
+              baseURL: process.env.BASE_URL || process.env.BASE_URI,
+            }),
           )
         : callbackURLInitial;
     if (callbackURL) {
@@ -261,7 +268,7 @@ export default class OAuth1Authentication<State = Mixed> {
     }
     const userAuthorizationParams = options.userAuthorizationParams;
     if (userAuthorizationParams) {
-      Object.keys(userAuthorizationParams).forEach(key => {
+      Object.keys(userAuthorizationParams).forEach((key) => {
         userAuthorizationURL.searchParams.set(
           key,
           userAuthorizationParams[key],

packages/oauth2/src/index.ts

@@ -8,7 +8,7 @@ import StateVerificationFailure from './errors/StateVerificationFailure';
 import TokenError from './errors/TokenError';
 import InternalOAuthError from './errors/InternalOAuthError';
 import getUID from './getUID';
-import originalURL from './originalURL';
+import getRequestURL from '@authentication/request-url';
 const OAuth2Base = require('oauth').OAuth2;
 
 // This type used to be exported from http but has gone missing
@@ -261,7 +261,14 @@ export default class OAuth2Authentication<State = Mixed, Results = Mixed> {
     return typeof this._callbackURL === 'string'
       ? new URL(
           this._callbackURL,
-          originalURL(req, {trustProxy: this._trustProxy}),
+          getRequestURL(req, {
+            trustProxy:
+              this._trustProxy === undefined
+                ? req.app.get('trust proxy') ||
+                  process.env.NODE_ENV === 'development'
+                : this._trustProxy,
+            baseURL: process.env.BASE_URL || process.env.BASE_URI,
+          }),
         )
       : this._callbackURL;
   }
@@ -279,7 +286,7 @@ export default class OAuth2Authentication<State = Mixed, Results = Mixed> {
     const authorizeUrl = new URL(this._authorizeURL.href);
     const p = options.params;
     if (p) {
-      Object.keys(p).forEach(key => {
+      Object.keys(p).forEach((key) => {
         authorizeUrl.searchParams.set(key, p[key]);
       });
     }

packages/passwordless/src/index.ts

@@ -24,7 +24,7 @@ import Store, {
   StoreTransaction,
 } from './Store';
 import Token from './Token';
-import originalURL from './originalURL';
+import getRequestURL from '@authentication/request-url';
 
 import {
   CreateTokenStatusKind,
@@ -173,8 +173,8 @@ export default class PasswordlessAuthentication<State> {
       options.maxAge === undefined
         ? ms('1 hour')
         : typeof options.maxAge === 'number'
-          ? options.maxAge
-          : ms(options.maxAge);
+        ? options.maxAge
+        : ms(options.maxAge);
     if (
       typeof this._maxAge !== 'number' ||
       isNaN(this._maxAge) ||
@@ -210,7 +210,7 @@ export default class PasswordlessAuthentication<State> {
     // from behind a single router, but over the long run, we want to keep
     // this pretty low or someone could be quite abusive.
     this._createTokenByIpRateLimit = new BucketRateLimit(
-      this._getStore(ip => 'create_ip_' + ip),
+      this._getStore((ip) => 'create_ip_' + ip),
       {
         interval: '10 minutes',
         maxSize: 20,
@@ -223,7 +223,7 @@ export default class PasswordlessAuthentication<State> {
     // a few attempts.  It is possible a user might get spammed with a
     // few token e-mails, but this will quickly stem the tide.
     this._createTokenByUserRateLimit = new ExponentialRateLimit(
-      this._getStore(userID => 'user_' + userID),
+      this._getStore((userID) => 'user_' + userID),
       {
         baseDelay: '5 minutes',
         factor: 2,
@@ -235,7 +235,7 @@ export default class PasswordlessAuthentication<State> {
     // We don't use an exponential backoff because resetting it when a
     // correct token attempt happens would defeat the point.
     this._validatePassCodeByIpRateLimit = new BucketRateLimit(
-      this._getStore(ip => 'validate_ip_' + ip),
+      this._getStore((ip) => 'validate_ip_' + ip),
       {
         interval: '10 minutes',
         maxSize: 20,
@@ -253,7 +253,14 @@ export default class PasswordlessAuthentication<State> {
     return typeof this._callbackURL === 'string'
       ? new URL(
           this._callbackURL,
-          originalURL(req, {trustProxy: this._trustProxy}),
+          getRequestURL(req, {
+            trustProxy:
+              this._trustProxy === undefined
+                ? req.app.get('trust proxy') ||
+                  process.env.NODE_ENV === 'development'
+                : this._trustProxy,
+            baseURL: process.env.BASE_URL || process.env.BASE_URI,
+          }),
         )
       : new URL(this._callbackURL.href);
   }
@@ -265,8 +272,8 @@ export default class PasswordlessAuthentication<State> {
   }
   private _getStore<T>(idToString: (id: T) => string): RateLimitStoreAPI<T> {
     return {
-      tx: fn =>
-        this._store.tx(store =>
+      tx: (fn) =>
+        this._store.tx((store) =>
           fn({
             save(id, state, oldState) {
               return store.saveRateLimit(idToString(id), state, oldState);
@@ -323,7 +330,7 @@ export default class PasswordlessAuthentication<State> {
     ]);
     const passCodeHash = await hash(passCode);
     // store the token
-    const tokenID = await this._store.tx(store =>
+    const tokenID = await this._store.tx((store) =>
       store.saveToken({
         userID,
         dos: dosCode,
@@ -446,7 +453,7 @@ export default class PasswordlessAuthentication<State> {
           (await verify(
             passCode,
             token.passCodeHash,
-            async updatedPassCodeHash => {
+            async (updatedPassCodeHash) => {
               // we're about to delete the token anyway,
               // so no need to update it
             },

packages/request-url/README.md

@@ -0,0 +1,3 @@
+# @authentication/request-url
+
+For documentation, see https://www.atauthentication.com/docs/request-url.html

packages/request-url/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@authentication/request-url",
+  "version": "0.0.0",
+  "description": "",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "dependencies": {},
+  "scripts": {},
+  "repository": "https://github.com/ForbesLindesay/authentication/tree/master/packages/request-url",
+  "bugs": "https://github.com/ForbesLindesay/authentication/issues",
+  "license": "GPL-3.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "homepage": "https://www.atauthentication.com/docs/request-url.html"
+}