Commit Graph

3781 Commits

Author SHA1 Message Date
r888888888
ebd3ece4e8 update version 2014-10-24 16:22:44 -07:00
r888888888
321e3afa7d enable saved searches for everyone 2014-10-24 16:22:30 -07:00
r888888888
b6d4386949 fixes #2269 2014-10-23 16:42:04 -07:00
r888888888
981e6dab67 no longer require presence of ugoira tag to process ugoira posts 2014-10-23 16:34:31 -07:00
r888888888
c9ee4f242f restyle ugoira controls 2014-10-23 16:00:58 -07:00
Toks
f51bc6ccd5 Merge branch 'ugoira' 2014-10-23 17:14:46 -04:00
Toks
88bd1d0172 Fix seek handle overlapping image slightly 2014-10-23 17:09:46 -04:00
Albert Yi
efcb8c77d7 Merge pull request #2268 from r888888888/ugoira
Native pixiv ugoira support
2014-10-23 12:46:58 -07:00
r888888888
69564c4bff fix async processing for ugoira 2014-10-22 22:48:20 -07:00
r888888888
e8f973601c fixes for ugoira convert 2014-10-22 22:15:05 -07:00
Albert Yi
4ef18c61aa Merge pull request #2277 from evazion/ugoira-fix-model
Fix frame data records being created for non-ugoira posts.
2014-10-22 17:26:03 -07:00
r888888888
8d4c9d7955 fix pixiv tests 2014-10-22 17:22:36 -07:00
evazion
035466cfdf Fix call to PixivUgoiraConverter.delay.
Should be `PixivUgoiraConverter.new.delay`, not PixivUgoiraConverter.delay`.
2014-10-19 10:26:21 -05:00
evazion
6ca01334af Fix frame data records being created for non-ugoira posts.
* Prevent non-ugoira posts from getting dummy frame data records with
  all the columns set to null.
* Make `data` and `content_type` columns NOT NULL, since they should
  always be present.
* Remove the timestamps while we're at it, since they don't seem
  necessary for anything.
2014-10-19 10:23:28 -05:00
Toks
260de869b1 Delete empty file 2014-10-19 02:30:03 -07:00
Toks
1bcec0fbbf Add seek slider 2014-10-19 02:30:03 -07:00
Toks
34e3fd45b9 Improve ugoira controls 2014-10-19 02:30:03 -07:00
r888888888
b1d5bb8272 make ugoira webm+preview generation async 2014-10-19 02:30:03 -07:00
evazion
5754dcb260 Fix file extension when backing up ugoira to S3. 2014-10-19 02:30:03 -07:00
evazion
38cb35ffbd Only fetch ugoira data for ugoira URLs.
Don't fetch ugoira data for http://i1.pixiv.net/img35/img/kinokoyarou/46165361.png URLs.
2014-10-19 02:30:03 -07:00
evazion
aa01a386f6 Fix ugoira to work with notes.
* Change the id of the canvas tag to 'image'. This is what the notes JS
  expects. It's also what the shift+e edit shortcut depends on.
* Add data-original-width/height attributes, which are what the notes JS
  needs to position notes properly.
* Add all the other data attributes that regular images have, because
  why not.
2014-10-19 02:30:03 -07:00
evazion
c0a803e3a6 Allow ugoira to be uploaded directly from the zip URL.
This refactors things such that

* Fetching the ugoira frame data happens at the end of rewrite, not
  rewrite_html_pages. This way uploading zip URLs should work.
* The source data is cached in an instance variable in case it
  was indeed fetched during rewrite_html_pages. This way it doesn't get
  fetched a second time.
2014-10-19 02:30:03 -07:00
evazion
484224cee6 Fix rename forgotten in d253057. 2014-10-19 02:30:03 -07:00
Toks
dbe4a7ebf6 Fix regressed autocomplete changes
also update the patch file
2014-10-19 02:30:03 -07:00
Toks
b3dbd0be4c Simplify zip extracting code 2014-10-19 02:30:03 -07:00
Toks
230a5ad37e Fix ugoira thumbs not being scaled down to 150x150 2014-10-19 02:30:03 -07:00
Toks
029f0eff06 Fix webm posts linking to nonexistent large_file_path 2014-10-19 02:30:03 -07:00
Toks
5f9ce7ee47 Fix get_image_url_from_page call 2014-10-19 02:30:02 -07:00
Toks
d47327be1d Fix argument error 2014-10-19 02:30:02 -07:00
Toks
b9ec86d611 Fix large webm sample writing to .jpg path 2014-10-19 02:30:02 -07:00
Toks
cbc3b48778 Fix zip file not being closed
file.get_input_stream leaves the file open by default, which means the
zip cannot be moved later on. But the block version of it closes the
file automatically.
2014-10-19 02:30:02 -07:00
Toks
d05311a3eb Fix error reading zip 2014-10-19 02:30:02 -07:00
Toks
4ab58e841e Fix frame data record not being expunged along with post 2014-10-19 02:30:02 -07:00
r888888888
5f063d693a fully implement ugoira js player, upgrade jquery and jquery-ui 2014-10-19 02:30:02 -07:00
r888888888
4c73fb9f79 add ugoira support in view 2014-10-19 02:30:02 -07:00
r888888888
3bb06c2be4 integrate ugoiras into zip+webm+preview 2014-10-19 02:30:02 -07:00
r888888888
0a61aac231 refactor 2014-10-19 02:30:02 -07:00
Toks
5bc0bb88cf Fix webm converter outputting non-webm videos
mkvmerge didn't realize it was supposed to output a webm specifically
because write_path does not have a file extension. The --webm option
tells it this instead.
2014-10-19 02:30:02 -07:00
r888888888
57001a7e39 minor sanitization of file extensions 2014-10-19 02:30:01 -07:00
r888888888
fb2219d4ac integrate ugoira converted into upload flow 2014-10-19 02:30:01 -07:00
r888888888
50730c6d0d implement ugoira converter 2014-10-19 02:30:01 -07:00
Toks
36be58561b Fix last frame of webms not displaying right in some browsers
Some browsers like Chrome (and some video players like MPC-HC) do not
display the last frame of a webm (or they display it, but only very
briefly) if set to loop. This commit is a hack to force the last frame
to display for the correct amount of time by duplicating it.
2014-10-19 02:30:01 -07:00
Toks
047c6a300c Various fixes to ugoira->webm converter
* Fix regex for getting frame data not working if agent is logged in to
pixiv
* Fix #unpack not returning the unpacked folder
* Fix frame_data being inaccessible because it was a local variable
* Fix images getting put in tmpdir, when they're expected to be in
tmpdir/images
* Fix deleting the tmpdir manually (it gets deleted automatically)
* Fix output webm being put in tmpdir (which gets deleted) instead of
write_path
2014-10-19 02:30:01 -07:00
r888888888
3a2c58de3f work on ugoira converter 2014-10-19 02:30:01 -07:00
Toks
c082ed18ce Fix deleted posts link not being visible to basic members 2014-10-18 02:05:51 -04:00
Albert Yi
b9208b9834 Merge pull request #2275 from evazion/xss/artist-history
Fix XSS in /artist_versions.
2014-10-17 14:33:59 -07:00
Albert Yi
4249f528f9 Merge pull request #2274 from evazion/xss/pool-gallery
Fix XSS in pool names in /pools/gallery page.
2014-10-17 14:33:48 -07:00
Albert Yi
6d68f1357e Merge pull request #2273 from evazion/xss/post-source
Fix XSS in source link on post show page.
2014-10-17 14:33:29 -07:00
evazion
de289ee5d3 Fix XSS in /artist_versions.
1) Put `<script>alert("xss 1")</script>` in the Other Names field in an
   artist entry.
2) Put `<script>alert("xss 2")</script>` in the URLs field.
3) Trick someone into the viewing the history page for that artist.
2014-10-17 15:22:51 -05:00
evazion
a38e12f091 Fix XSS in source link on post show page.
This vulnerability allows someone to create a source link that appears
to lead to Pixiv like normal, but that actually executes Javascript code
when clicked.

1) Set the source of a post to javascript:"http://img1.pixiv.net/img/xss/";alert("xss");
2) Wait for someone to click the source link in the Information sidebar.
3) Profit.

The cause is that the regexes for detecting Pixiv URLs aren't anchored
to the front of the string using \A. This allows non-http:// links to be
created.
2014-10-17 15:15:48 -05:00