Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log: remove support for external images. #3168

Merged
merged 3 commits into from Nov 26, 2017

Conversation

@mkrautz
Copy link
Member

commented Jul 13, 2017

This change remove support for loading external images.
That is, this change ensures Mumble doesn't load images from tags in text messages,
comments and channel descriptions via HTTP or HTTPS.

With this change in place, Mumble only supports images that are embedded
in the message via data URLs.

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Jul 13, 2017

Includes #3167, because they clash.
Also includes #3169, because it uses features from it.

Fixed.

@mkrautz mkrautz force-pushed the mkrautz:log-remove-external-url-support branch from 6b2993e to 3683a54 Jul 13, 2017

@Kissaki
Copy link
Member

left a comment

commit 6e069 message "This change remove[s] support"

Couldn't see where Log::log actually inserts the image, but apart from my comments LGTM.

if (url.scheme() != QLatin1String("data") && g.s.iMaxImageSize <= 0) {
return qi;
}

if (! url.isValid() || url.isRelative()) {

This comment has been minimized.

Copy link
@Kissaki

Kissaki Jul 13, 2017

Member

We could drop the isRelative check as we check for data scheme.

connect(rep, SIGNAL(metaDataChanged()), this, SLOT(receivedHead()));
connect(rep, SIGNAL(finished()), this, SLOT(finished()));
QNetworkReply *rep = Network::get(url);
connect(rep, SIGNAL(metaDataChanged()), this, SLOT(receivedHead()));

This comment has been minimized.

Copy link
@Kissaki

Kissaki Jul 13, 2017

Member

The method receivedHead was removed.

@mkrautz mkrautz force-pushed the mkrautz:log-remove-external-url-support branch from 3683a54 to 13f2502 Jul 14, 2017

mkrautz added 3 commits Jul 14, 2017
Log: remove support for external images.
This change removes support for loading external images.
That is, this change ensures Mumble doesn't load images from <img> tags in text messages,
comments and channel descriptions via HTTP or HTTPS.

With this change in place, Mumble only supports images that are embedded
in the message via data URLs.

@mkrautz mkrautz force-pushed the mkrautz:log-remove-external-url-support branch from 13f2502 to 7578e85 Jul 14, 2017

@Kissaki

This comment has been minimized.

Copy link
Member

commented Jul 16, 2017

Related: FR #2185 allow editing welcome message in client

Kissaki added a commit to Kissaki/mumble that referenced this pull request Aug 12, 2017
Implement FR mumble-voip#2185
Related removal of support for external images in mumble-voip#3168

@mkrautz mkrautz merged commit 3125439 into mumble-voip:master Nov 26, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.