From 5c0d068c5ba3a1b5822eb6b890197fe93e9b70a7 Mon Sep 17 00:00:00 2001 From: Blade Date: Sat, 3 May 2014 22:59:24 -0400 Subject: [PATCH 1/9] Update archives.json --- json/archives.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/archives.json b/json/archives.json index 0049b8a9f..0559be43f 100644 --- a/json/archives.json +++ b/json/archives.json @@ -55,7 +55,7 @@ }, { "uid": 5, "name": "Love is Over", - "domain": "loveisover.me", + "domain": "archive.loveisover.me", "http": true, "https": true, "software": "foolfuuka", From 859c643cd8ac1e935e331431cf5a2a10fa528a73 Mon Sep 17 00:00:00 2001 From: Blade Date: Sun, 4 May 2014 02:31:01 -0400 Subject: [PATCH 2/9] Update archives.json --- json/archives.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/archives.json b/json/archives.json index 0559be43f..d1903de45 100644 --- a/json/archives.json +++ b/json/archives.json @@ -59,8 +59,8 @@ "http": true, "https": true, "software": "foolfuuka", - "boards": ["d", "i"], - "files": ["d", "i"] + "boards": ["d", "i", "lgbt"], + "files": ["d", "i", "lgbt"] }, { "uid": 8, "name": "Rebecca Black Tech", From 3fa2846011f859a667ed6e27b87c30aa17a5fc23 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 9 May 2014 11:15:48 +0200 Subject: [PATCH 3/9] Close #1628. Fix #1576. Fix #1627. --- src/General/Index.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/General/Index.coffee b/src/General/Index.coffee index f412b7541..ebc0fdc43 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -204,7 +204,7 @@ Index = $.add $.id('info'), a setupNavLinks: -> for el in $$ '.navLinks.desktop > a' - if el.getAttribute('href') is '.././catalog' + if /\/catalog$/.test el.pathname el.href = '.././' $.on el, 'click', -> switch @textContent From b8debe756af71a375f8e34e880612bc1eb0dff50 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 9 May 2014 11:33:46 +0200 Subject: [PATCH 4/9] Fix #1634. --- CHANGELOG.md | 2 ++ src/General/Build.coffee | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f51c690c0..ab580b0d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- [Security fix](https://github.com/MayhemYDG/4chan-x/issues/1634). + ### 3.20.12 - *2014-05-03* - Fix quoting. diff --git a/src/General/Build.coffee b/src/General/Build.coffee index a2652156b..19b2e83a4 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -47,7 +47,7 @@ Build = name: data.filename + data.ext timestamp: "#{data.tim}#{data.ext}" url: if boardID is 'f' - "//i.4cdn.org/#{boardID}/#{data.filename}#{data.ext}" + "//i.4cdn.org/#{boardID}/#{escape data.filename}#{data.ext}" else "//i.4cdn.org/#{boardID}/#{data.tim}#{data.ext}" height: data.h @@ -271,7 +271,7 @@ Build = pageCount = Index.liveThreadIDs.indexOf(thread.ID) // Index.threadsNumPerPage + 1 subject = if thread.OP.info.subject - "
#{thread.OP.info.subject}
" + "
#{thread.OP.nodes.subject.innerHTML}
" else '' comment = thread.OP.nodes.comment.innerHTML.replace /(
\s*){2,}/g, '
' From f4592eec4141135f6c4da868db6b1d3a6ad21a58 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 9 May 2014 11:42:12 +0200 Subject: [PATCH 5/9] Fix #1635. --- src/General/Build.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/General/Build.coffee b/src/General/Build.coffee index 19b2e83a4..6a59730ae 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -47,7 +47,7 @@ Build = name: data.filename + data.ext timestamp: "#{data.tim}#{data.ext}" url: if boardID is 'f' - "//i.4cdn.org/#{boardID}/#{escape data.filename}#{data.ext}" + "//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}" else "//i.4cdn.org/#{boardID}/#{data.tim}#{data.ext}" height: data.h @@ -145,7 +145,7 @@ Build = imgSrc = if boardID is 'f' '' else - "" + + "" + "#{fileSize}" + "" @@ -161,7 +161,7 @@ Build = fileDims = if file.name[-3..] is 'pdf' then 'PDF' else "#{file.width}x#{file.height}" fileInfo = "
File: " + - "#{if file.isSpoiler then 'Spoiler Image' else shortFilename}" + + "#{if file.isSpoiler then 'Spoiler Image' else shortFilename}" + " (#{fileSize}, #{fileDims})
" fileHTML = "
#{fileInfo}#{imgSrc}
" From be49e9688909af4af421142da1b6ac673924bec5 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Fri, 9 May 2014 11:43:52 +0200 Subject: [PATCH 6/9] Release 4chan X v3.20.13. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab580b0d5..2274cface 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.20.13 - *2014-05-09* + - [Security fix](https://github.com/MayhemYDG/4chan-x/issues/1634). ### 3.20.12 - *2014-05-03* diff --git a/package.json b/package.json index ec6bb80d2..4dcd6f16f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.20.12", + "version": "3.20.13", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X", From 196cb1d83dd66ac749b2ca0afd18900b3c802e11 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 9 May 2014 21:49:11 +1000 Subject: [PATCH 7/9] Small update to placeholder styling Firefox 19+ has an opacity set to `::-moz-placeholder`, so it was never *really* `#aaa` to begin with. This gets rid of the `!important` and the `:hover`, making it a lot more consistent with Chrome. --- css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css/style.css b/css/style.css index 545a7422b..13be06eec 100644 --- a/css/style.css +++ b/css/style.css @@ -18,9 +18,9 @@ outline: none; transition: color .25s, border-color .25s, flex .25s; } -.field::-moz-placeholder, -.field:hover::-moz-placeholder { - color: #AAA !important; +.field::-moz-placeholder { + color: #AAA; + opacity: 1; } .field:hover { border-color: #999; From acedc22378857c4205fb304352609600872ec28f Mon Sep 17 00:00:00 2001 From: Alexander Schittler Date: Sat, 10 May 2014 20:33:43 +0200 Subject: [PATCH 8/9] Added Innovandalism Archive --- json/archives.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/json/archives.json b/json/archives.json index d1903de45..0891ca4f5 100644 --- a/json/archives.json +++ b/json/archives.json @@ -125,4 +125,13 @@ "software": "foolfuuka", "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "s4s", "sci", "sp", "tg", "tv", "u", "vg", "vp", "vr", "wsg"], "files": ["a", "biz", "d", "diy", "gd", "jp", "m", "s4s", "sci", "tg", "u", "vg", "vp", "vr", "wsg"] +}, { + "uid": 18, + "name": "Innovandalism Archive", + "domain": "boards.innovandalism.eu", + "http": true, + "https": false, + "software": "foolfuuka", + "boards": ["v"], + "files": [] }] From 0719b594a49e5c08737e03758fec7feabe01e261 Mon Sep 17 00:00:00 2001 From: Alexander Schittler Date: Sat, 10 May 2014 21:15:51 +0200 Subject: [PATCH 9/9] So why aren't these ordered :/ --- json/archives.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/archives.json b/json/archives.json index 0891ca4f5..5cb05f54c 100644 --- a/json/archives.json +++ b/json/archives.json @@ -126,7 +126,7 @@ "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "s4s", "sci", "sp", "tg", "tv", "u", "vg", "vp", "vr", "wsg"], "files": ["a", "biz", "d", "diy", "gd", "jp", "m", "s4s", "sci", "tg", "u", "vg", "vp", "vr", "wsg"] }, { - "uid": 18, + "uid": 19, "name": "Innovandalism Archive", "domain": "boards.innovandalism.eu", "http": true,