Merge branch 'gsolbeck-development' into development: GuessWhat preve…

…nt multiword hint exploit
tiltfactor · Aug 12, 2014 · b026146 · b026146
2 parents 6794c8a + 51bada9
commit b026146
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 0 deletions.
diff --git a/www/js/mg.game.api.js b/www/js/mg.game.api.js
@@ -246,6 +246,12 @@ MG_GAME_API = function ($) {
       }
     },
 
+    preventEvents : function (element, events) {
+      for (var i = 0; i < events.length; i++) {
+        element.bind(events[i], function (e) { e.preventDefault(); });
+      }
+    },
+
     /*
      * Standardized interface to call the GameAPI action. Allowing games to
      * implement additional API call back functions

diff --git a/www/protected/modules/games/assets/guesswhat/js/mg.game.guesswhat.js b/www/protected/modules/games/assets/guesswhat/js/mg.game.guesswhat.js
@@ -40,6 +40,28 @@ MG_GAME_GUESSWHAT = function ($) {
 
             MG_GAME_GUESSWHAT.wordField = $("#tag");
 
+            //From ZenTag (mg.game.zentag.js:23)
+            // TODO: Refactor this part
+            // allowed keys, in game
+            $("#tag").bind("keydown", function(event) {
+                if (event.shiftKey) { // When pressing shift, only allow these
+                    return (
+                        (event.which >= 97 && event.which <= 122) || // a-z
+                        (event.which >= 65 && event.which <= 90) // A-Z
+                    );
+                }
+                else {
+                    return (
+                        (event.which >= 97 && event.which <= 122) ||// a-z
+                        (event.which >= 65 && event.which <= 90) || // A-Z
+                        event.which === 8 || event.which == 13
+                    );
+                }
+            });
+
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_GUESSWHAT.wordField, ["paste", "cut", "copy"]);
+
             // submit on enter
             MG_GAME_GUESSWHAT.wordField.focus().keydown(function (event) {
                 if (event.keyCode == 13) {

diff --git a/www/protected/modules/games/assets/nextag/js/mg.game.nextag.js b/www/protected/modules/games/assets/nextag/js/mg.game.nextag.js
@@ -52,6 +52,9 @@ MG_GAME_NEXTAG = function ($) {
                 }
             });
 
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_NEXTAG.wordField, ["paste", "cut", "copy"]);
+
             MG_GAME_NEXTAG.submitButton = $("#button-play").click(MG_GAME_NEXTAG.onsubmit);
             // TRY to get pass button to submit correct value.
             MG_GAME_NEXTAG.passButton = $("#button-pass").click(MG_GAME_NEXTAG.onpass);

diff --git a/www/protected/modules/games/assets/oneup/js/mg.game.oneup.main.js b/www/protected/modules/games/assets/oneup/js/mg.game.oneup.main.js
@@ -86,6 +86,9 @@ MG_GAME_ONEUP = function ($) {
 
             MG_GAME_ONEUP.wordField = $("#word");
 
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_ONEUP.wordField, ["paste", "cut", "copy"]);
+
             $('nav#menu-left').mmenu();
             $('nav#menu-right').mmenu({
                 position:'right',

diff --git a/www/protected/modules/games/assets/pyramid/js/mg.game.pyramid.js b/www/protected/modules/games/assets/pyramid/js/mg.game.pyramid.js
@@ -140,6 +140,9 @@ MG_GAME_PYRAMID = function ($) {
                 }
             });
 
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_PYRAMID.wordField, ["paste", "cut", "copy"]);
+
             MG_GAME_PYRAMID.submitButton = $("#button-play").click(MG_GAME_PYRAMID.onsubmit);
             // Delete the default footer content.
             $("#footer").html("");

diff --git a/www/protected/modules/games/assets/stupidrobot/js/mg.game.stupidrobot.js b/www/protected/modules/games/assets/stupidrobot/js/mg.game.stupidrobot.js
@@ -464,6 +464,9 @@ MG_GAME_STUPIDROBOT = function ($) {
                 return event.which != 32;
             });
 
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_STUPIDROBOT.wordField, ["paste", "cut", "copy"]);
+
             // set original level
             if (typeof(noTicker) == 'undefined')
                 MG_GAME_STUPIDROBOT.timerTick();

diff --git a/www/protected/modules/games/assets/zenpond/js/mg.game.zenpond.js b/www/protected/modules/games/assets/zenpond/js/mg.game.zenpond.js
@@ -40,6 +40,9 @@ MG_GAME_ZENPOND = function ($) {
                 }
             });
 
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_ZENPOND.wordField, ["paste", "cut", "copy"]);
+
             MG_GAME_ZENPOND.submitButton = $("#button-play").click(MG_GAME_ZENPOND.onsubmit);
 
             // call the game API's init settings

diff --git a/www/protected/modules/games/assets/zentag/js/mg.game.zentag.js b/www/protected/modules/games/assets/zentag/js/mg.game.zentag.js
@@ -50,6 +50,9 @@ MG_GAME_ZENTAG = function ($) {
                 }
             });
 
+            //Prevent paste/cut/copy
+            MG_GAME_API.preventEvents(MG_GAME_ZENTAG.wordField, ["paste", "cut", "copy"]);
+
             MG_GAME_ZENTAG.submitButton = $("#button-play").click(MG_GAME_ZENTAG.onsubmit);
             // TRY to get pass button to submit correct value.
             MG_GAME_ZENTAG.passButton = $("#button-pass").click(MG_GAME_ZENTAG.onpass);

diff --git a/www/protected/modules/games/assets/zentagplayoncemoveon/js/mg.game.zentagplayoncemoveon.js b/www/protected/modules/games/assets/zentagplayoncemoveon/js/mg.game.zentagplayoncemoveon.js
@@ -27,6 +27,9 @@ MG_GAME_ZENTAG_PLAYONCE = function ($) {
           return false;
         }
       });
+
+      //Prevent paste/cut/copy
+      MG_GAME_API.preventEvents(MG_GAME_ZENTAG_PLAYONCE.wordField, ["paste", "cut", "copy"]);
 
       MG_GAME_ZENTAG_PLAYONCE.submitButton = $("#button-play").click(MG_GAME_ZENTAG_PLAYONCE.onsubmit);
     // TRY to get pass button to submit correct value.