Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eeea01b authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am f5c82622: am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric...

am f5c82622: am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806

* commit 'f5c82622':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
parents ce29ea93 f5c82622
Loading
Loading
Loading
Loading
+33 −16
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ $(window).history(function(e, hash) {
 */
function loadVideo(id, title, autoplay) {
  if($("." + id).hasClass("noplay")) {
  	console.log("noplay");
  	//console.log("noplay");
  	autoplay = false;
  	$("." + id).removeClass("noplay");
  }
@@ -255,6 +255,11 @@ var clickVideoAttempts = 0; // Used with clickVideo()
 * @param videoId  The ID of the video to click
 */
function clickVideo(videoId) {
  if (!isAlphaNumeric(videoId)) {
    clickDefaultVideo();
    return;
  }
  
  if ($("." + videoId).length != 0) {  // if we find the video, click it and return
    $("." + videoId).addClass("noplay"); // add class to indicate we should NOT autoplay (class removed by loadVideo)
    $("." + videoId + ":first").click();
@@ -274,6 +279,18 @@ function clickVideo(videoId) {
  }
}

/* returns true if the provided text is alphanumeric, false otherwise 
   TODO: move this to the dev site js library */
function isAlphaNumeric(text){
  var regex=/^[0-9A-Za-z]+$/; //^[a-zA-z]+$/
  if(regex.test(text)){
    return true;
  } else {
    console.log("Bogus video ID");
    return false;
  }
}

/* Click the default video that should be loaded on page load (the first video in the featured list) */
function clickDefaultVideo() {
  if ($("#mainBodyRight .videoPreviews a:first").length != 0) {