moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sanitize google drive IDs to remove URL hash etc.

This commit is contained in:
Calvin Montgomery 2018-01-14 15:15:59 -08:00
parent 46a738b7f4
commit 1797e11b43
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Calvin Montgomery", "author": "Calvin Montgomery",
"name": "CyTube", "name": "CyTube",
"description": "Online media synchronizer and chat", "description": "Online media synchronizer and chat",
"version": "3.52.1", "version": "3.52.2",
"repository": { "repository": {
"url": "http://github.com/calzoneman/sync" "url": "http://github.com/calzoneman/sync"
}, },

5
src/get-info.js
View File

@ -467,6 +467,11 @@ var Getters = {
/* google docs */ /* google docs */
gd: function (id, callback) { gd: function (id, callback) {
if (!/^[a-zA-Z0-9_-]+$/.test(id)) {
callback("Invalid ID: " + id);
return;
}
var data = { var data = {
type: "googledrive", type: "googledrive",
kind: "single", kind: "single",

4
www/js/util.js
View File

@ -1368,8 +1368,8 @@ function parseMediaLink(url) {
}; };
} }
if ((m = url.match(/(?:docs|drive)\.google\.com\/file\/d\/([^\/]*)/)) || if ((m = url.match(/(?:docs|drive)\.google\.com\/file\/d\/([a-zA-Z0-9_-]+)/)) ||
(m = url.match(/drive\.google\.com\/open\?id=([^&]*)/))) { (m = url.match(/drive\.google\.com\/open\?id=([a-zA-Z0-9_-]+)/))) {
return { return {
id: m[1], id: m[1],
type: "gd" type: "gd"