link2aws 1.0.18 → 1.0.20

package/README.md

@@ -23,6 +23,11 @@ Or run directly from source:
 # firefox link2aws.github.io/index.html
 ```
 
+You can make links that auto-redirect to the AWS console by appending `#arn...` like this:
+
+https://link2aws.github.io/#arn:aws:ec2:us-west-1:136693071363:image/ami-0851c4af3ebd71c35
+
+
 ### Use as command line tool
 
 Via NPM:

package/link2aws.js

@@ -2,8 +2,30 @@
 // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/resource-ids.html
 class ARN {
     constructor(text) {
+        if (typeof(text) != 'string') {
+            throw Error("ARN must be a string");
+        }
+
         text = text.trim();
 
+        // length limit
+        // There is no documented limit for ARNs in general.
+        // For IAM User, the documented limit is 2048.
+        // Please file an issue if you can find a resource type
+        // with a higher documented limit.
+        if (text.length > 2048) {
+            throw Error("ARN too long");
+        }
+
+        // Check for invalid characters.
+        // This is meant to catch malicious inputs. This will not
+        // catch all invalid ARNs, as some resource types have
+        // stricter rules. Please file an issue if you are aware
+        // of a valid ARN that is rejected by this check.
+        if (!/^[a-zA-Z0-9:/+=,.@_*#\-]*$/.test(text)) {
+            throw Error("ARN contains invalid characters");
+        }
+
         // split into tokens; leaving resource-id with colons together
         var firstTokens = text.split(':');
         var tokens = firstTokens.splice(0, 6);
@@ -54,6 +76,13 @@ class ARN {
             throw Error("Bad number of tokens");
         }
 
+        // region must have valid format.
+        // This is security relevant as it is used as a subdomain
+        // before the console domain.
+        if (this.region != '' && !/^[a-z0-9-]*$/.test(this.region)) {
+            throw Error(`Bad region: "${this.region}"`);
+        }
+
         this._linkTemplates = this._getLinkTemplates();
     }
 
@@ -404,7 +433,7 @@ class ARN {
                 "dhcp-options": null,
                 "elastic-gpu": null,
                 "fpga-image": null,
-                "image": null,
+                "image": () => `https://${this.region}.${this.console}/ec2/home?region=${this.region}#ImageDetails:imageId=${this.resource}`,
                 "instance": () => `https://${this.region}.${this.console}/ec2/v2/home`,
                 "internet-gateway": null,
                 "key-pair": null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "link2aws",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "Convert ARN (Amazon Resource Name) to AWS Console link",
   "main": "link2aws.js",
   "directories": {