Commit 115afe9b authored by Philipp Hörist's avatar Philipp Hörist

[httpupload] Add ConfigDialog

- Add a option that allows to disable HTTPS verification
parent 1ea5bf8f
# -*- coding: utf-8 -*-
#
# Copyright (C) 2017 Philipp Hörist <philipp AT hoerist.com>
#
# This file is part of Gajim.
#
# Gajim is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Gajim is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
from enum import IntEnum, unique
from gi.repository import Gtk
from gajim.options_dialog import OptionsDialog
from gajim.common.const import Option, OptionKind, OptionType
class HTTPUploadConfigDialog(OptionsDialog):
def __init__(self, plugin, parent):
self.plugin = plugin
options = [
Option(OptionKind.SWITCH, _('Enable HTTPS Verification'),
OptionType.BOOL, self.plugin.config['verify'],
callback=self.on_option, data='verify'),
]
OptionsDialog.__init__(self, parent, _('HTTP Upload Options'),
Gtk.DialogFlags.MODAL, options, None)
def on_option(self, value, data):
self.plugin.config[data] = value
......@@ -23,6 +23,7 @@ from urllib.parse import urlparse
import io
import mimetypes
import logging
from functools import partial
if os.name == 'nt':
import certifi
......@@ -34,6 +35,8 @@ from gajim.common import ged
from gajim.plugins import GajimPlugin
from gajim.dialogs import FileChooserDialog, ErrorDialog
from .config_dialog import HTTPUploadConfigDialog
log = logging.getLogger('gajim.plugin_system.httpupload')
IQ_CALLBACK = {}
......@@ -42,7 +45,10 @@ NS_HTTPUPLOAD = 'urn:xmpp:http:upload'
class HTTPUploadPlugin(GajimPlugin):
def init(self):
self.config_dialog = None
self.config_default_values = {
'verify': (True, '')
}
self.config_dialog = partial(HTTPUploadConfigDialog, self)
self.events_handlers = {
'agent-info-received': (
ged.PRECORE, self.handle_agent_info_received),
......@@ -342,10 +348,19 @@ class Base(object):
request = Request(
file.put, data=file.stream, headers=headers, method='PUT')
log.info("Opening Urllib upload request...")
if os.name == 'nt':
transfer = urlopen(request, cafile=certifi.where(), timeout=30)
if not self.plugin.config['verify']:
context = ssl.create_default_context()
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
log.warning('CERT Verification disabled')
transfer = urlopen(request, timeout=30, context=context)
else:
transfer = urlopen(request, timeout=30)
if os.name == 'nt':
transfer = urlopen(
request, cafile=certifi.where(), timeout=30)
else:
transfer = urlopen(request, timeout=30)
file.stream.close()
log.info('Urllib upload request done, response code: %s',
transfer.getcode())
......@@ -492,6 +507,7 @@ class UploadAbortedException(Exception):
def __str__(self):
return "Upload Aborted"
class UnsecureTransportError(Exception):
def __str__(self):
return 'Server returned unsecure transport'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment