Merge branch 'develop'

Load Github buttons over HTTPS

README.md

@@ -11,7 +11,7 @@ Analyzes a webpage and detects **performance** or **front-end code quality** iss
     <tr>
         <td width="70%">
             The <b>online tool</b> (recommended): 
-            <a href="http://yellowlab.tools" target="_blank">http://yellowlab.tools</a>
+            <a href="https://yellowlab.tools" target="_blank">https://yellowlab.tools</a>
         </td>
         <td width="30%">
             <img src="./doc/img/YLT-animated.gif"></img>

front/src/css/dashboard.css

@@ -158,14 +158,6 @@
 .summary .fromShare {
   margin-bottom: 3em;
 }
-.summary .apiTip {
-  font-size: 0.8em;
-  margin-bottom: 4em;
-  color: #413;
-}
-.summary .apiTip a {
-  color: inherit;
-}
 .summary .tweet .tweetText {
   color: #413;
   background: #F2F2F2;
@@ -189,3 +181,11 @@
 .summary .tweet input {
   font-size: 0.9em;
 }
+.summary .sponsor {
+  font-size: 0.9em;
+  margin-bottom: 4em;
+  color: #413;
+}
+.summary .sponsor a {
+  color: inherit;
+}

front/src/css/index.css

@@ -177,3 +177,6 @@ input[type=submit].clicked {
   top: 0.2em;
   box-shadow: none;
 }
+.homeSponsor {
+  margin-top: 3em;
+}

front/src/css/main.css

@@ -295,6 +295,9 @@ a.linkButton {
 .footer .github {
   margin: 1em 0 0 0.5em;
 }
+.footer .sponsor {
+  font-size: 0.9em;
+}
 [class^="icon-"]:before,
 [class*=" icon-"]:before {
   vertical-align: baseline;

front/src/js/app.js

@@ -35,14 +35,14 @@ yltApp.run(['$rootScope', '$location', function($rootScope, $location) {
 
     // Google Analytics
     $rootScope.$on('$routeChangeSuccess', function(){
-        if (ga) {
+        if (typeof ga !== "undefined") {
             ga('send', 'pageview', {'page': $location.path()});
         }
     });
 
     // GitHub star button (asynchronously loaded iframe)
     window.addEventListener('load', function() {
-        window.document.getElementById('ghbtn').src = 'http://ghbtns.com/github-btn.html?user=gmetais&repo=YellowLabTools&type=star&count=true&size=large';
+        window.document.getElementById('ghbtn').src = 'https://ghbtns.com/github-btn.html?user=gmetais&repo=YellowLabTools&type=star&count=true&size=large';
     });
 }]);
 

front/src/js/controllers/dashboardCtrl.js

@@ -41,11 +41,11 @@ dashboardCtrl.controller('DashboardCtrl', ['$scope', '$rootScope', '$routeParams
     };
 
     $scope.shareOnTwitter = function(message) {
-        openSocialPopup('https://twitter.com/intent/tweet?text=' + encodeURIComponent(message + 'http://yellowlab.tools'));
+        openSocialPopup('https://twitter.com/intent/tweet?text=' + encodeURIComponent(message + 'https://yellowlab.tools'));
     };
 
     $scope.shareOnLinkedin = function(message) {
-        openSocialPopup('https://www.linkedin.com/shareArticle?mini=true&url=http://yellowlab.tools&title=' + encodeURIComponent(message) + '&summary=' + encodeURIComponent('YellowLabTools is a free online tool that analyzes performance and front-end quality of a webpage.'));
+        openSocialPopup('https://www.linkedin.com/shareArticle?mini=true&url=https://yellowlab.tools&title=' + encodeURIComponent(message) + '&summary=' + encodeURIComponent('YellowLabTools is a free online tool that analyzes performance and front-end quality of a webpage.'));
     };
 
     function openSocialPopup(url) {

front/src/js/directives/offendersDirectives.js

@@ -924,4 +924,15 @@
         };
     });
 
+    // Proxify an HTTP image to HTTPS if hosted on HTTPS
+    // Uses a great free open-source external service: https://images.weserv.nl
+    offendersDirectives.filter('https', function() {
+        return function(url) {
+            if (url && url.indexOf('http://') === 0 && window.location.protocol === 'https:') {
+                return 'https://images.weserv.nl/?url=' + encodeURIComponent(url.substr(7));
+            }
+            return url;
+        };
+    });
+
 })();

front/src/less/dashboard.less

@@ -158,15 +158,6 @@
     margin-bottom: 3em;
 }
 
-.summary .apiTip {
-    font-size: 0.8em;
-    margin-bottom: 4em;
-    color: #413;
-    a {
-        color: inherit;
-    }
-}
-
 .summary .tweet {
     .tweetText {
         color: #413;
@@ -189,4 +180,13 @@
     input {
         font-size: 0.9em;
     }
+}
+
+.summary .sponsor {
+    font-size: 0.9em;
+    margin-bottom: 4em;
+    color: #413;
+    a {
+        color: inherit;
+    }
 }

front/src/less/index.less

@@ -199,4 +199,8 @@ input[type=submit].clicked {
     left: 0.1em;
     top: 0.2em;
     box-shadow: none;
+}
+
+.homeSponsor {
+    margin-top: 3em;
 }

front/src/less/main.less

@@ -250,6 +250,9 @@ a.linkButton {
     .github {
         margin: 1em 0 0 0.5em;
     }
+    .sponsor {
+        font-size: 0.9em;
+    }
 }
 
 [class^="icon-"]:before, [class*=" icon-"]:before {

front/src/main.html

@@ -18,10 +18,10 @@
     <link rel="stylesheet" type="text/css" href="css/about.css">
     <!-- endbuild -->
 
-    <link rel="preconnect" href="//www.google-analytics.com">
-    <link rel="dns-prefetch" href="//www.google-analytics.com">
-    <link rel="preconnect" href="//ghbtns.com">
-    <link rel="dns-prefetch" href="//ghbtns.com">
+    <link rel="preconnect" href="https://www.google-analytics.com">
+    <link rel="dns-prefetch" href="https://www.google-analytics.com">
+    <link rel="preconnect" href="https://ghbtns.com">
+    <link rel="dns-prefetch" href="https://ghbtns.com">
     <link rel="preconnect" href="https://api.github.com">
     <link rel="dns-prefetch" href="https://api.github.com">
 

front/src/views/about.html

@@ -1,9 +1,13 @@
 <div class="about">
-    <p><b>Yellow Lab Tools</b> is an open source project by <a href="http://www.gaelmetais.com" target="_blank">Gaël Métais</a>. It lets you test a webpage (via an URL) and detects <b>performance</b> and <b>front-end code quality</b> issues.</p>
+    <p><b>Yellow Lab Tools</b> is an open source project by <a href="http://www.gaelmetais.com" target="_blank">Gaël Métais</a>. It allows you to test a webpage (via an URL) and detects <b>performance</b> and <b>front-end code quality</b> issues.</p>
 
-    <p>This is done by loading the webpage via PhantomJS and collecting various metrics and statistics with the help of <a href="https://github.com/macbre/phantomas" target="_blank">Phantomas</a>. These metrics are categorized and transformed into scores. It also gives in-depth details so developpers can correct the detected issues.</p>
+    <p>This is done by loading the webpage via PhantomJS and collecting various metrics and statistics with the help of <a href="https://github.com/macbre/phantomas" target="_blank">Phantomas</a>. These metrics are categorized and transformed into scores. It also gives in-depth details so that developers can correct the detected issues.</p>
 
     <p>By the way, <b>it's free</b> because we are geeks, not businessmen. All we want is <a href="https://github.com/gmetais/YellowLabTools" target="_blank" class="star">a <span>&#9733;</span> on GitHub</a>. It will boost our motivation to add more awesome features!!!</p>
 
+    <%if (sponsoring.about) { %>
+        <div class="sponsor"><%- sponsoring.about %></div>
+    <% } %>
+
     <p><br><a href="<%= baseUrl %>">Back to index</a></p>
 </div>

front/src/views/dashboard.html

@@ -55,9 +55,10 @@
         </div>
     </div>
 
-    <div ng-if="!error && !fromSocialShare" class="apiTip">
-        <b>Did you know?</b> You can <b>bookmark</b> this result page URL or <b>share it</b>, Yellow Lab Tools keeps test results for years!
-    </div>
+    <%if (sponsoring.dashboard) { %>
+        <div ng-if="!error && !fromSocialShare" class="sponsor"><%- sponsoring.dashboard %></div>
+    <% } %>
+    
 
     <div class="tweet" ng-if="!error && !fromSocialShare">
         <form ng-submit="sendTweet()">

front/src/views/index.html

@@ -110,3 +110,7 @@
         <p>Untangles the JavaScript spaghetti code</p>
     </div>
 </div>
+
+<%if (sponsoring.home) { %>
+    <div class="homeSponsor"><%- sponsoring.home %></div>
+<% } %>

front/src/views/rule.html

@@ -133,7 +133,7 @@
                     </div>
 
                     <div ng-if="policyName === 'lazyLoadableImagesBelowTheFold' || policyName === 'hiddenImages'">
-                        <img ng-src="{{offender}}" class="smallPreview checker"></img>
+                        <img ng-src="{{offender | https}}" class="smallPreview checker"></img>
                         <url-link url="offender" max-length="100"></url-link>
                     </div>
 
@@ -267,7 +267,7 @@
             <div ng-repeat="image in rule.offendersObj.list.images | orderBy:'-gain'">
                 <div>
                     Current file: <url-link url="image.url" max-length="50"></url-link>
-                    <div><a href="{{image.url}}" target="_blank"><img ng-src="{{image.url}}" class="checker" /></a></div>
+                    <div><a href="{{image.url}}" target="_blank"><img ng-src="{{image.url | https}}" class="checker" /></a></div>
                 </div>
                 <div>
                     <p ng-if="!image.afterCompression">Current weight: {{image.original | bytes}}</p>
@@ -364,7 +364,7 @@
                     <div>Weight (bytes)</div>
                 </div>
                 <div ng-repeat="request in requests track by $index">
-                    <div ng-if="type == 'image'"><img ng-src="{{request.url}}" class="smallPreview checker" /></div>
+                    <div ng-if="type == 'image'"><img ng-src="{{request.url | https}}" class="smallPreview checker" /></div>
                     <div><url-link url="request.url" max-length="100"></url-link></div>
                     <div>{{request.size}}</div>
                 </div>

lib/server/controllers/frontController.js

@@ -1,6 +1,8 @@
 var path        = require('path');
 var express     = require('express');
 
+var serverSettings = (process.env.IS_TEST) ? require('../../../test/fixtures/settings.json') : require('../../../server_config/settings.json');
+
 var FrontController = function(app) {
     'use strict';
 
@@ -14,7 +16,8 @@ var FrontController = function(app) {
         app.get(route, function(req, res) {
             res.setHeader('Cache-Control', 'public, max-age=20');
             res.render(path.join(__dirname, assetsPath, 'main.html'), {
-                baseUrl: app.locals.baseUrl || '/'
+                baseUrl: app.locals.baseUrl || '/',
+                sponsoring: serverSettings.sponsoring || {}
             });
         });
     });
@@ -23,7 +26,8 @@ var FrontController = function(app) {
     app.get('/views/:viewName', function(req, res) {
         res.setHeader('Cache-Control', 'public, max-age=' + cacheDuration);
         res.render(path.join(__dirname, assetsPath, 'views/' + req.params.viewName), {
-            baseUrl: app.locals.baseUrl || '/'
+            baseUrl: app.locals.baseUrl || '/',
+            sponsoring: serverSettings.sponsoring || {}
         });
     });
     

lib/server/middlewares/apiLimitsMiddleware.js

@@ -6,25 +6,27 @@ var debug = require('debug')('apiLimitsMiddleware');
 var apiLimitsMiddleware = function(req, res, next) {
     'use strict';
 
-    debug('Entering API Limits Middleware with IP address %s', req.connection.remoteAddress);
+    var ipAddress = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+
+    debug('Entering API Limits Middleware with IP address %s', ipAddress);
 
     if (req.path.indexOf('/api/') === 0 && !res.locals.hasApiKey) {
         
         
         if (req.path === '/api/runs') {
             
-            if (!runsTable.accepts(req.connection.remoteAddress)) {
+            if (!runsTable.accepts(ipAddress)) {
                 // Sorry :/
-                debug('Too many tests launched from IP address %s', req.connection.remoteAddress);
+                debug('Too many tests launched from IP address %s', ipAddress);
                 res.status(429).send('Too many requests');
                 return;
             }
 
         }
 
-        if (!callsTable.accepts(req.connection.remoteAddress)) {
+        if (!callsTable.accepts(ipAddress)) {
             // Sorry :/
-            debug('Too many API requests from IP address %s', req.connection.remoteAddress);
+            debug('Too many API requests from IP address %s', ipAddress);
             res.status(429).send('Too many requests');
             return;
         }

package.json

@@ -1,12 +1,12 @@
 {
   "name": "yellowlabtools",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Online tool to audit a webpage for performance and front-end quality issues",
   "license": "GPL-2.0",
   "author": {
     "name": "Gaël Métais",
     "email": "gael@gaelmetais.com",
-    "url": "http://www.gaelmetais.com"
+    "url": "https://www.gaelmetais.com"
   },
   "repository": {
     "type": "git",

server_config/settings-prod.json

@@ -9,5 +9,11 @@
     },
     "maxAnonymousRunsPerDay": 99999999,
     "maxAnonymousCallsPerDay": 99999999,
-    "blockedUrls": []
+    "blockedUrls": [],
+
+    "sponsoring" : {
+        "home": "(this is a private instance)",
+        "dashboard": null,
+        "about": "(this is a private instance)"
+    }
 }

server_config/settings.json

@@ -9,5 +9,11 @@
     },
     "maxAnonymousRunsPerDay": 99999999,
     "maxAnonymousCallsPerDay": 99999999,
-    "blockedUrls": []
+    "blockedUrls": [],
+
+    "sponsoring" : {
+        "home": "(this is a private instance)",
+        "dashboard": null,
+        "about": "(this is a private instance)"
+    }
 }

test/core/imageOptimizerTest.js

@@ -161,6 +161,8 @@ describe('imageOptimizer', function() {
     });
 
     it('should optimize an SVG image losslessly', function(done) {
+        this.timeout(5000);
+        
         var fileContent = fs.readFileSync(path.resolve(__dirname, '../www/svg-image.svg'));
 
         var fileSize = fileContent.length;