Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Messagelib
Commits
d73ae7e2
Commit
d73ae7e2
authored
Feb 22, 2021
by
Laurent Montel
Browse files
Forward url blocked
parent
13204ffb
Pipeline
#51847
canceled with stage
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
messageviewer/src/viewer/viewer_p.cpp
View file @
d73ae7e2
...
...
@@ -927,6 +927,11 @@ void ViewerPrivate::initHtmlWidget()
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
messageIsNotAScam
,
this
,
&
ViewerPrivate
::
slotMessageIsNotAScam
);
connect
(
mScamDetectionWarning
,
&
ScamDetectionWarningWidget
::
addToWhiteList
,
this
,
&
ViewerPrivate
::
slotAddToWhiteList
);
connect
(
mViewer
,
&
MailWebEngineView
::
pageIsScrolledToBottom
,
this
,
&
ViewerPrivate
::
pageIsScrolledToBottom
);
connect
(
mViewer
,
&
MailWebEngineView
::
urlBlocked
,
this
,
&
ViewerPrivate
::
slotUrlBlocked
);
}
void
ViewerPrivate
::
slotUrlBlocked
(
const
QUrl
&
url
)
{
}
void
ViewerPrivate
::
applyZoomValue
(
qreal
factor
,
bool
saveConfig
)
...
...
messageviewer/src/viewer/viewer_p.h
View file @
d73ae7e2
...
...
@@ -609,6 +609,7 @@ private:
bool
mHtmlMailGlobalSetting
=
false
;
bool
mHtmlLoadExternalDefaultSetting
=
false
;
bool
mHtmlLoadExtOverride
=
false
;
void
slotUrlBlocked
(
const
QUrl
&
url
);
public:
KMime
::
Message
::
Ptr
mMessage
;
// the current message, if it was set manually
...
...
messageviewer/src/viewer/webengine/loadexternalreferencesurlinterceptor/loadexternalreferencesurlinterceptor.cpp
View file @
d73ae7e2
...
...
@@ -6,6 +6,7 @@
#include
"loadexternalreferencesurlinterceptor.h"
#include
<QDebug>
#include
<QWebEngineUrlRequestInfo>
using
namespace
MessageViewer
;
...
...
@@ -30,6 +31,7 @@ bool LoadExternalReferencesUrlInterceptor::interceptRequest(QWebEngineUrlRequest
}
else
{
if
(
info
.
resourceType
()
==
QWebEngineUrlRequestInfo
::
ResourceTypeImage
&&
!
info
.
requestUrl
().
isLocalFile
()
&&
(
scheme
!=
QLatin1String
(
"cid"
)))
{
Q_EMIT
urlBlocked
(
info
.
requestUrl
());
qDebug
()
<<
" info.requestUrl()"
<<
info
.
requestUrl
();
return
true
;
}
else
if
(
info
.
resourceType
()
==
QWebEngineUrlRequestInfo
::
ResourceTypeFontResource
)
{
return
true
;
...
...
messageviewer/src/viewer/webengine/mailwebengineview.cpp
View file @
d73ae7e2
...
...
@@ -82,6 +82,7 @@ MailWebEngineView::MailWebEngineView(KActionCollection *ac, QWidget *parent)
d
->
mNetworkAccessManager
=
new
WebEngineViewer
::
InterceptorManager
(
this
,
ac
,
this
);
d
->
mExternalReference
=
new
MessageViewer
::
LoadExternalReferencesUrlInterceptor
(
this
);
connect
(
d
->
mExternalReference
,
&
MessageViewer
::
LoadExternalReferencesUrlInterceptor
::
urlBlocked
,
this
,
&
MailWebEngineView
::
urlBlocked
);
d
->
mNetworkAccessManager
->
addInterceptor
(
d
->
mExternalReference
);
auto
cidReference
=
new
MessageViewer
::
CidReferencesUrlInterceptor
(
this
);
d
->
mNetworkAccessManager
->
addInterceptor
(
cidReference
);
...
...
messageviewer/src/viewer/webengine/mailwebengineview.h
View file @
d73ae7e2
...
...
@@ -81,6 +81,7 @@ protected:
Q_SIGNALS:
void
wheelZoomChanged
(
int
numSteps
);
void
openUrl
(
const
QUrl
&
url
);
void
urlBlocked
(
const
QUrl
&
url
);
void
messageMayBeAScam
();
void
formSubmittedForbidden
();
void
mailTrackingFound
(
const
MessageViewer
::
BlockMailTrackingUrlInterceptor
::
MailTrackerBlackList
&
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment