paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use camo to avoid mixed content warnings when displaying emoji.

Browse Source
This commit is contained in:
Tim Abbott
2016-04-27 21:43:40 -07:00
parent 52c1e8ac7d
commit 5bd94c15c7
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend_tests/node_tests/echo.js
View File

@@ -3,7 +3,8 @@ var path = require('path');
var fs = require('fs'); var fs = require('fs');
set_global('page_params', {realm_emoji: { set_global('page_params', {realm_emoji: {
burrito: 'static/third/gemoji/images/emoji/burrito.png' burrito: {display_url: 'static/third/gemoji/images/emoji/burrito.png',
source_url: 'static/third/gemoji/images/emoji/burrito.png'}
}}); }});
add_dependencies({ add_dependencies({

3
frontend_tests/node_tests/templates.js
View File

@@ -733,7 +733,8 @@ function render(template_name, args) {
var args = { var args = {
emoji: { emoji: {
"name": "MouseFace", "name": "MouseFace",
"url": "http://emojipedia-us.s3.amazonaws.com/cache/46/7f/467fe69069c408e07517621f263ea9b5.png" "display_url": "http://emojipedia-us.s3.amazonaws.com/cache/46/7f/467fe69069c408e07517621f263ea9b5.png",
"source_url": "http://emojipedia-us.s3.amazonaws.com/cache/46/7f/467fe69069c408e07517621f263ea9b5.png"
} }
}; };

5
static/js/admin.js
View File

@@ -77,8 +77,9 @@ function populate_streams (streams_data) {
exports.populate_emoji = function (emoji_data) { exports.populate_emoji = function (emoji_data) {
var emoji_table = $('#admin_emoji_table').expectOne(); var emoji_table = $('#admin_emoji_table').expectOne();
emoji_table.find('tr.emoji_row').remove(); emoji_table.find('tr.emoji_row').remove();
_.each(emoji_data, function (url, name) { _.each(emoji_data, function (data, name) {
emoji_table.append(templates.render('admin_emoji_list', {emoji: {name: name, url: url}})); emoji_table.append(templates.render('admin_emoji_list', {emoji: {name: name, source_url: data.source_url,
display_url: data.display_url}}));
}); });
loading.destroy_indicator($('#admin_page_emoji_loading_indicator')); loading.destroy_indicator($('#admin_page_emoji_loading_indicator'));
}; };

4
static/js/emoji.js
View File

@@ -17,8 +17,8 @@ _.each(emoji_names, function (value) {
exports.update_emojis = function update_emojis(realm_emojis) { exports.update_emojis = function update_emojis(realm_emojis) {
// Copy the default emoji list and add realm-specific emoji to it // Copy the default emoji list and add realm-specific emoji to it
exports.emojis = default_emojis.slice(0); exports.emojis = default_emojis.slice(0);
_.each(realm_emojis, function (url, name) { _.each(realm_emojis, function (data, name) {
exports.emojis.push({emoji_name:name, emoji_url: url}); exports.emojis.push({emoji_name:name, emoji_url: data.display_url});
}); });
exports.emojis_by_name = {}; exports.emojis_by_name = {};
_.each(exports.emojis, function (emoji) { _.each(exports.emojis, function (emoji) {

2
static/templates/admin_emoji_list.handlebars
View File

@@ -4,7 +4,7 @@
<span class="emoji_name">{{name}}</span> <span class="emoji_name">{{name}}</span>
</td> </td>
<td> <td>
<span class="emoji_image"><img src="{{url}}" alt="{{name}}" /></span> <span class="emoji_image"><a href="{{source_url}}"><img src="{{display_url}}" alt="{{name}}" /></a></span>
</td> </td>
<td> <td>
<button class="btn delete btn-danger" data-emoji-name="{{name}}"> <button class="btn delete btn-danger" data-emoji-name="{{name}}">

4
zerver/lib/bugdown/__init__.py
View File

@@ -553,12 +553,12 @@ class Emoji(markdown.inlinepatterns.Pattern):
orig_syntax = match.group("syntax") orig_syntax = match.group("syntax")
name = orig_syntax[1:-1] name = orig_syntax[1:-1]
realm_emoji = {} # type: Dict[str, str] realm_emoji = {} # type: Dict[str, Dict[str, str]]
if db_data is not None: if db_data is not None:
realm_emoji = db_data['emoji'] realm_emoji = db_data['emoji']
if current_message and name in realm_emoji: if current_message and name in realm_emoji:
return make_emoji(name, realm_emoji[name], orig_syntax) return make_emoji(name, realm_emoji[name]['display_url'], orig_syntax)
elif name in emoji_list: elif name in emoji_list:
src = 'static/third/gemoji/images/emoji/%s.png' % (name) src = 'static/third/gemoji/images/emoji/%s.png' % (name)
return make_emoji(name, src, orig_syntax) return make_emoji(name, src, orig_syntax)

4
zerver/models.py
View File

@@ -15,6 +15,7 @@ from zerver.lib.cache import cache_with_key, flush_user_profile, flush_realm, \
from zerver.lib.utils import make_safe_digest, generate_random_token from zerver.lib.utils import make_safe_digest, generate_random_token
from django.db import transaction from django.db import transaction
from zerver.lib.avatar import gravatar_hash, get_avatar_url from zerver.lib.avatar import gravatar_hash, get_avatar_url
from zerver.lib.camo import get_camo_url
from django.utils import timezone from django.utils import timezone
from django.contrib.sessions.models import Session from django.contrib.sessions.models import Session
from zerver.lib.timestamp import datetime_to_timestamp from zerver.lib.timestamp import datetime_to_timestamp
@@ -229,7 +230,8 @@ class RealmEmoji(models.Model):
def get_realm_emoji_uncached(realm): def get_realm_emoji_uncached(realm):
d = {} d = {}
for row in RealmEmoji.objects.filter(realm=realm): for row in RealmEmoji.objects.filter(realm=realm):
d[row.name] = row.img_url d[row.name] = dict(source_url=row.img_url,
display_url=get_camo_url(row.img_url))
return d return d
def flush_realm_emoji(sender, **kwargs): def flush_realm_emoji(sender, **kwargs):

4
zerver/tests/test_bugdown.py
View File

@@ -10,7 +10,7 @@ from zerver.lib.actions import (
do_remove_realm_emoji, do_remove_realm_emoji,
get_realm, get_realm,
) )
from zerver.lib.camo import get_camo_url
from zerver.models import ( from zerver.models import (
get_user_profile_by_email, get_user_profile_by_email,
Message, Message,
@@ -314,7 +314,7 @@ class BugdownTest(TestCase):
def test_realm_emoji(self): def test_realm_emoji(self):
def emoji_img(name, url): def emoji_img(name, url):
return '<img alt="%s" class="emoji" src="%s" title="%s">' % (name, url, name) return '<img alt="%s" class="emoji" src="%s" title="%s">' % (name, get_camo_url(url), name)
zulip_realm = get_realm('zulip.com') zulip_realm = get_realm('zulip.com')
url = "https://zulip.com/test_realm_emoji.png" url = "https://zulip.com/test_realm_emoji.png"