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

compose: Don’t convert absolute upload URLs to relative.

Browse Source 
Especially not by trying to edit markdown with a context-ignorant
unescaped regexp.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-29 13:15:14 -07:00
committed by Anders Kaseorg
parent e0f4013b21
commit 83120f218b
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/compose.js
View File

@@ -394,9 +394,7 @@ test_ui("send_message", ({override}) => {
stub_state.reify_message_id_checked += 1; stub_state.reify_message_id_checked += 1;
}); });
// Setting message content with a host server link and we will assert $("#compose-textarea").val("[foobar](/user_uploads/123456)");
// later that this has been converted to a relative link.
$("#compose-textarea").val("[foobar](https://foo.com/user_uploads/123456)");
$("#compose-textarea").trigger("blur"); $("#compose-textarea").trigger("blur");
$("#compose-send-status").show(); $("#compose-send-status").show();
$("#compose-send-button").prop("disabled", true); $("#compose-send-button").prop("disabled", true);

17
static/js/compose.js
View File

@@ -54,19 +54,6 @@ import * as zcommand from "./zcommand";
let uppy; let uppy;
export const uploads_domain = document.location.protocol + "//" + document.location.host;
export const uploads_path = "/user_uploads";
export const uploads_re = new RegExp(
"\\]\\(" + uploads_domain + "(" + uploads_path + "[^\\)]+)\\)",
"g",
);
function make_uploads_relative(content) {
// Rewrite uploads in Markdown links back to domain-relative form
return content.replace(uploads_re, "]($1)");
}
export function compute_show_video_chat_button() { export function compute_show_video_chat_button() {
const available_providers = page_params.realm_available_video_chat_providers; const available_providers = page_params.realm_available_video_chat_providers;
if (page_params.realm_video_chat_provider === available_providers.disabled.id) { if (page_params.realm_video_chat_provider === available_providers.disabled.id) {
@@ -144,12 +131,10 @@ export function create_message_object() {
topic = empty_topic_placeholder(); topic = empty_topic_placeholder();
} }
const content = make_uploads_relative(compose_state.message_content());
// Changes here must also be kept in sync with echo.try_deliver_locally // Changes here must also be kept in sync with echo.try_deliver_locally
const message = { const message = {
type: compose_state.get_message_type(), type: compose_state.get_message_type(),
content, content: compose_state.message_content(),
sender_id: page_params.user_id, sender_id: page_params.user_id,
queue_id: page_params.queue_id, queue_id: page_params.queue_id,
stream: "", stream: "",

1
static/js/upload.js
View File

@@ -3,7 +3,6 @@ import ProgressBar from "@uppy/progress-bar";
import XHRUpload from "@uppy/xhr-upload"; import XHRUpload from "@uppy/xhr-upload";
import $ from "jquery"; import $ from "jquery";
import * as compose from "./compose";
import * as compose_actions from "./compose_actions"; import * as compose_actions from "./compose_actions";
import * as compose_state from "./compose_state"; import * as compose_state from "./compose_state";
import * as compose_ui from "./compose_ui"; import * as compose_ui from "./compose_ui";