Improved FTP support for Chromium extension
This commit is contained in:
parent
7d5bf83ce8
commit
d04f81b964
58
extensions/chromium/feature-detect.js
Normal file
58
extensions/chromium/feature-detect.js
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||||
|
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
|
||||||
|
/*
|
||||||
|
Copyright 2014 Mozilla Foundation
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
/* globals chrome */
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
var Features = {
|
||||||
|
featureDetectLastUA: '',
|
||||||
|
// Whether ftp: in XMLHttpRequest is allowed
|
||||||
|
extensionSupportsFTP: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
chrome.storage.local.get(Features, function(features) {
|
||||||
|
Features = features;
|
||||||
|
if (features.featureDetectLastUA === navigator.userAgent) {
|
||||||
|
// Browser not upgraded, so the features did probably not change.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!features.extensionSupportsFTP) {
|
||||||
|
features.extensionSupportsFTP = featureTestFTP();
|
||||||
|
}
|
||||||
|
|
||||||
|
Features.featureDetectLastUA = navigator.userAgent;
|
||||||
|
chrome.storage.local.set(Features);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Tests whether the extension can perform a FTP request.
|
||||||
|
// Feature is supported since Chromium 35.0.1888.0 (r256810).
|
||||||
|
function featureTestFTP() {
|
||||||
|
var x = new XMLHttpRequest();
|
||||||
|
// The URL does not need to exist, as long as the scheme is ftp:.
|
||||||
|
x.open('GET', 'ftp://ftp.mozilla.org/');
|
||||||
|
try {
|
||||||
|
x.send();
|
||||||
|
// Previous call did not throw error, so the feature is supported!
|
||||||
|
// Immediately abort the request so that the network is not hit at all.
|
||||||
|
x.abort();
|
||||||
|
return true;
|
||||||
|
} catch (e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
/* globals chrome, URL, getViewerURL */
|
/* globals chrome, URL, getViewerURL, Features */
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
'use strict';
|
'use strict';
|
||||||
@ -158,7 +158,8 @@ limitations under the License.
|
|||||||
var streamInfo = getStream(sender.tab.id, pdfUrl) || {};
|
var streamInfo = getStream(sender.tab.id, pdfUrl) || {};
|
||||||
sendResponse({
|
sendResponse({
|
||||||
streamUrl: streamInfo.streamUrl,
|
streamUrl: streamInfo.streamUrl,
|
||||||
contentLength: streamInfo.contentLength
|
contentLength: streamInfo.contentLength,
|
||||||
|
extensionSupportsFTP: Features.extensionSupportsFTP
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<script src="chrome.tabs.executeScriptInFrame.js"></script>
|
<script src="chrome.tabs.executeScriptInFrame.js"></script>
|
||||||
|
<script src="feature-detect.js"></script>
|
||||||
<script src="pdfHandler.js"></script>
|
<script src="pdfHandler.js"></script>
|
||||||
<script src="extension-router.js"></script>
|
<script src="extension-router.js"></script>
|
||||||
<script src="pdfHandler-v2.js"></script>
|
<script src="pdfHandler-v2.js"></script>
|
||||||
|
@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
/* globals chrome */
|
/* globals chrome, Features */
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
@ -172,6 +172,27 @@ chrome.webRequest.onHeadersReceived.addListener(
|
|||||||
},
|
},
|
||||||
['blocking','responseHeaders']);
|
['blocking','responseHeaders']);
|
||||||
|
|
||||||
|
chrome.webRequest.onBeforeRequest.addListener(
|
||||||
|
function onBeforeRequestForFTP(details) {
|
||||||
|
if (!Features.extensionSupportsFTP) {
|
||||||
|
chrome.webRequest.onBeforeRequest.removeListener(onBeforeRequestForFTP);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (isPdfDownloadable(details)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var viewerUrl = getViewerURL(details.url);
|
||||||
|
return { redirectUrl: viewerUrl };
|
||||||
|
},
|
||||||
|
{
|
||||||
|
urls: [
|
||||||
|
'ftp://*/*.pdf',
|
||||||
|
'ftp://*/*.PDF'
|
||||||
|
],
|
||||||
|
types: ['main_frame', 'sub_frame']
|
||||||
|
},
|
||||||
|
['blocking']);
|
||||||
|
|
||||||
chrome.webRequest.onBeforeRequest.addListener(
|
chrome.webRequest.onBeforeRequest.addListener(
|
||||||
function(details) {
|
function(details) {
|
||||||
if (isPdfDownloadable(details)) {
|
if (isPdfDownloadable(details)) {
|
||||||
|
@ -1876,9 +1876,10 @@ function webViewerLoad(evt) {
|
|||||||
// PDFView.setTitleUsingUrl(file);
|
// PDFView.setTitleUsingUrl(file);
|
||||||
// return;
|
// return;
|
||||||
// }
|
// }
|
||||||
// if (isFTPFile) {
|
// if (isFTPFile && !response.extensionSupportsFTP) {
|
||||||
// // Stream not found, and it's loaded from FTP. Reload the page, because
|
// // Stream not found, and it's loaded from FTP.
|
||||||
// // it is not possible to get resources over ftp using XMLHttpRequest.
|
// // When the browser does not support loading ftp resources over
|
||||||
|
// // XMLHttpRequest, just reload the page.
|
||||||
// // NOTE: This will not lead to an infinite redirect loop, because
|
// // NOTE: This will not lead to an infinite redirect loop, because
|
||||||
// // if the file exists, then the streamsPrivate API will capture the
|
// // if the file exists, then the streamsPrivate API will capture the
|
||||||
// // stream and send back the response. If the stream does not exist, then
|
// // stream and send back the response. If the stream does not exist, then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user