Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Add SSL error page to handle SSL certificate error #2985

Merged
merged 1 commit into from
Apr 30, 2015
Merged

Add SSL error page to handle SSL certificate error #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions runtime/browser/ssl_error_page.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
// Copyright (c) 2015 Intel Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "xwalk/runtime/browser/ssl_error_page.h"

#include "base/strings/string_number_conversions.h"
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/web_contents.h"

using content::WebContents;
using net::SSLInfo;

namespace xwalk {

enum UserCommandsFromPage {
CMD_DONT_PROCEED = 0,
CMD_PROCEED = 1,
};

SSLErrorPage::SSLErrorPage(WebContents* web_contents,
int cert_error,
const SSLInfo& ssl_info,
const GURL& request_url,
const base::Callback<void(bool)>& callback)
: web_contents_(web_contents),
cert_error_(cert_error),
ssl_info_(ssl_info),
request_url_(request_url),
callback_(callback),
interstitial_page_(nullptr) {
}

SSLErrorPage::~SSLErrorPage() {
}

void SSLErrorPage::Show() {
DCHECK(!interstitial_page_);
interstitial_page_ = content::InterstitialPage::Create(
web_contents_, true, request_url_, this);
interstitial_page_->Show();
}

void SSLErrorPage::OnProceed() {
// Allow certificate
callback_.Run(true);
callback_.Reset();
}

void SSLErrorPage::OnDontProceed() {
// Deny certificate
callback_.Run(false);
callback_.Reset();
}

void SSLErrorPage::CommandReceived(const std::string& command) {
int cmd = 0;
bool retval = base::StringToInt(command, &cmd);
DCHECK(retval);
switch (cmd) {
case CMD_DONT_PROCEED:
interstitial_page_->DontProceed();
break;
case CMD_PROCEED:
interstitial_page_->Proceed();
break;
default:
break;
}
}

// TODO(Peter Wang): Provide a more user-friendly page including
// icons, localized strings, and the details of SSL error etc.
std::string SSLErrorPage::GetHTMLContents() {
std::string proceed_link =
"<p><a href=\"javascript:proceed()\"> Proceed to " +
request_url_.spec() + "</a></p>";
return "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">"
"<html><head><title>Untrusted Connection</title>"
"<script>function proceed() {"
"window.domAutomationController.setAutomationId(1);"
"window.domAutomationController.send(1);}"
"</script></head>"
"<body><h1>This Connection is Untrusted</h1>"
"<p>This site uses an invalid security certificate.</p>"
"<p>Close or proceed if your understand the risks</p>" +
proceed_link +
"</body></html>";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is concern about localization here, I'm okay to add TODO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, and it would be nice to load it from resources rather than hardcode it here. It's OK to do this later.

}

} // namespace xwalk
55 changes: 55 additions & 0 deletions runtime/browser/ssl_error_page.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Copyright (c) 2015 Intel Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef XWALK_RUNTIME_BROWSER_SSL_ERROR_PAGE_H_
#define XWALK_RUNTIME_BROWSER_SSL_ERROR_PAGE_H_

#include <string>

#include "base/callback.h"
#include "content/public/browser/interstitial_page_delegate.h"
#include "net/ssl/ssl_info.h"
#include "url/gurl.h"

namespace content {
class InterstitialPage;
class WebContents;
}

namespace xwalk {

class SSLErrorPage : public content::InterstitialPageDelegate {
public:
SSLErrorPage(content::WebContents* web_contents,
int cert_error,
const net::SSLInfo& ssl_info,
const GURL& request_url,
const base::Callback<void(bool)>& callback);

~SSLErrorPage() override;

// Show an interstitial page to let user to choose the next action
void Show();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not move code in Show() to ctor?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so, we have to always be careful to put 'interstitial_page_' as the last member of class 'SSLErrorPage'. Since 'SSLErrorPage' is the delegate of 'interstitial_page_' (its class is 'content::InterstitialPage'), many memebers (e.g. ssl_info_) of 'SSLErrorPage' will be referred (e.g., through GetHTMLContents), so we have make sure all members being initialized before 'interstitial_page_'.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still can not understand your reason:

  1. Why interstitial_page_ must be as last member? Any compiler error?
  2. What real problem you referred private members in GetHTMLContents()? An example could be helpful

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean you hope the code like this
SSLErrorPage::SSLErrorPage() {
...
Show();
...
}
The 'content::InterstitialPage::Show' (called by 'SSLErrorPage::Show'') will invoke 'xwalk::SSLErrorPage::GetHTMLContents', and the last one will refer to, for example, 'SSLErrorPage::ssl_info_' to get the details of error (how detailed is depending on our design of UI) to show.
So, we have to add a comment to provent to initialize related memebers after it.


protected:
// Overridden methods of InterstitialPageDelegate
void OnProceed() override;
void OnDontProceed() override;
void CommandReceived(const std::string& command) override;
std::string GetHTMLContents() override;

private:
content::WebContents* web_contents_;
const int cert_error_;
const net::SSLInfo ssl_info_;
const GURL request_url_;
base::Callback<void(bool)> callback_;
content::InterstitialPage* interstitial_page_;

DISALLOW_COPY_AND_ASSIGN(SSLErrorPage);
};

} // namespace xwalk

#endif // XWALK_RUNTIME_BROWSER_SSL_ERROR_PAGE_H_
15 changes: 15 additions & 0 deletions runtime/browser/xwalk_content_browser_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "xwalk/runtime/browser/renderer_host/pepper/xwalk_browser_pepper_host_factory.h"
#include "xwalk/runtime/browser/runtime_platform_util.h"
#include "xwalk/runtime/browser/runtime_quota_permission_context.h"
#include "xwalk/runtime/browser/ssl_error_page.h"
#include "xwalk/runtime/browser/speech/speech_recognition_manager_delegate.h"
#include "xwalk/runtime/browser/xwalk_browser_context.h"
#include "xwalk/runtime/browser/xwalk_browser_main_parts.h"
Expand Down Expand Up @@ -275,6 +276,20 @@ void XWalkContentBrowserClient::AllowCertificateError(
&cancel_request);
if (cancel_request)
*result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
#else
content::RenderFrameHost* render_frame_host =
content::RenderFrameHost::FromID(render_process_id, render_frame_id);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need not valid render_frame_host?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the next statement, 'WebContents::FromRenderFrameHost' is pretty strong, even feed 'nullptr' to him.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
if (!web_contents) {
NOTREACHED();
return;
}

// The interstitial page shown is responsible for destroying
// this instance of SSLErrorPage
(new SSLErrorPage(web_contents, cert_error,
ssl_info, request_url, callback))->Show();
#endif
}

Expand Down
2 changes: 2 additions & 0 deletions xwalk.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@
'runtime/browser/runtime_url_request_context_getter.h',
'runtime/browser/speech/speech_recognition_manager_delegate.cc',
'runtime/browser/speech/speech_recognition_manager_delegate.h',
'runtime/browser/ssl_error_page.cc',
'runtime/browser/ssl_error_page.h',
'runtime/browser/sysapps_component.cc',
'runtime/browser/sysapps_component.h',
'runtime/browser/storage_component.cc',
Expand Down