--- a/Plugins/CGet/Run.py	Tue Jan 26 15:26:45 2021 +0100
+++ b/Plugins/CGet/Run.py	Thu Jan 28 15:52:41 2021 +0100
@@ -35,7 +35,7 @@
 ## Parse the command-line arguments
 ##
 
-parser = argparse.ArgumentParser(description = 'Run the integration tests for the patient recycling behavior.')
+parser = argparse.ArgumentParser(description = 'Run the integration tests for the C-GET SCP of Orthanc.')
 
 parser.add_argument('--server', 
                     default = 'localhost',

--- a/Plugins/WebDav/Run.py	Tue Jan 26 15:26:45 2021 +0100
+++ b/Plugins/WebDav/Run.py	Thu Jan 28 15:52:41 2021 +0100
@@ -43,7 +43,7 @@
 ## Parse the command-line arguments
 ##
 
-parser = argparse.ArgumentParser(description = 'Run the integration tests for the patient recycling behavior.')
+parser = argparse.ArgumentParser(description = 'Run the integration tests for the WebDAV server.')
 
 parser.add_argument('--server', 
                     default = 'localhost',

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Tests/CheckDicomTls.py	Thu Jan 28 15:52:41 2021 +0100
@@ -0,0 +1,211 @@
+#!/usr/bin/python
+
+# Orthanc - A Lightweight, RESTful DICOM Store
+# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+# Department, University Hospital of Liege, Belgium
+# Copyright (C) 2017-2021 Osimis S.A., Belgium
+#
+# This program 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.
+# 
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+import argparse
+import os
+import pprint
+import re
+import sys
+import subprocess
+import unittest
+
+from Toolbox import *
+
+
+##
+## Parse the command-line arguments
+##
+
+parser = argparse.ArgumentParser(description = 'Run the integration tests for DICOM TLS in Orthanc.')
+
+parser.add_argument('--server', 
+                    default = 'localhost',
+                    help = 'Address of the Orthanc server to test')
+parser.add_argument('--aet',
+                    default = 'ORTHANC',
+                    help = 'AET of the Orthanc instance to test')
+parser.add_argument('--dicom',
+                    type = int,
+                    default = 4242,
+                    help = 'DICOM port of the Orthanc instance to test')
+parser.add_argument('--rest',
+                    type = int,
+                    default = 8042,
+                    help = 'Port to the REST API')
+parser.add_argument('--username',
+                    default = 'alice',
+                    help = 'Username to the REST API')
+parser.add_argument('--password',
+                    default = 'orthanctest',
+                    help = 'Password to the REST API')
+parser.add_argument('--force', help = 'Do not warn the user',
+                    action = 'store_true')
+parser.add_argument('--config', help = 'Create the configuration files for this test in the current folder',
+                    action = 'store_true')
+parser.add_argument('options', metavar = 'N', nargs = '*',
+                    help='Arguments to Python unittest')
+
+args = parser.parse_args()
+
+
+##
+## Configure the testing context
+##
+
+
+if args.config:
+    def CreateCertificate(name):
+        subprocess.check_call([ 'openssl', 'req', '-x509', '-nodes', '-days', '365', '-newkey', 'rsa:2048',
+                                '-keyout', '%s.key' % name,
+                                '-out', '%s.crt' % name,
+                                '-subj', '/C=BE/CN=localhost' ])
+
+    print('Writing configuration to folder: %s' % args.config)
+    CreateCertificate('dicom-tls-a')
+    CreateCertificate('dicom-tls-b')
+    CreateCertificate('dicom-tls-c')  # Not trusted by Orthanc
+
+    with open('dicom-tls-trusted.crt', 'w') as f:
+        for i in [ 'dicom-tls-a.crt', 'dicom-tls-b.crt' ]:
+            with open(i, 'r') as g:
+                f.write(g.read())
+
+    with open('dicom-tls.json', 'w') as f:
+        f.write(json.dumps({
+            'DicomTlsEnabled' : True,
+            'DicomTlsCertificate' : 'dicom-tls-a.crt',
+            'DicomTlsPrivateKey' : 'dicom-tls-a.key',
+            'DicomTlsTrustedCertificates' : 'dicom-tls-trusted.crt',
+            'ExecuteLuaEnabled' : True,
+            'RemoteAccessAllowed' : True,
+            'RegisteredUsers' : {
+                'alice' : 'orthanctest'
+            },
+        }))
+
+    exit(0)
+
+
+if not args.force:
+    print("""
+WARNING: This test will remove all the content of your
+Orthanc instance running on %s!
+
+Are you sure ["yes" to go on]?""" % args.server)
+
+    if sys.stdin.readline().strip() != 'yes':
+        print('Aborting...')
+        exit(0)
+
+
+ORTHANC = DefineOrthanc(server = args.server,
+                        username = args.username,
+                        password = args.password,
+                        restPort = args.rest,
+                        aet = args.aet,
+                        dicomPort = args.dicom)
+
+
+##
+## The tests
+##
+
+
+FNULL = open(os.devnull, 'w')  # Emulates "subprocess.DEVNULL" on Python 2.7
+
+    
+class Orthanc(unittest.TestCase):
+    def setUp(self):
+        if (sys.version_info >= (3, 0)):
+            # Remove annoying warnings about unclosed socket in Python 3
+            import warnings
+            warnings.simplefilter('ignore', ResourceWarning)
+
+        DropOrthanc(ORTHANC)
+
+        
+    def test_incoming(self):
+        # No certificate     
+        self.assertRaises(Exception, lambda: subprocess.check_call([
+            FindExecutable('echoscu'),
+            ORTHANC['Server'], 
+            str(ORTHANC['DicomPort']),
+            '-aec', 'ORTHANC',
+        ], stderr = FNULL))
+
+        subprocess.check_call([
+            FindExecutable('echoscu'),
+            ORTHANC['Server'], 
+            str(ORTHANC['DicomPort']),
+            '-aec', 'ORTHANC',
+            '+tls', 'dicom-tls-b.key', 'dicom-tls-b.crt',
+            '+cf', 'dicom-tls-a.crt',
+        ], stderr = FNULL)
+
+        self.assertRaises(Exception, lambda: subprocess.check_call([
+            FindExecutable('echoscu'),
+            ORTHANC['Server'], 
+            str(ORTHANC['DicomPort']),
+            '-aec', 'ORTHANC',
+            '+tls', 'dicom-tls-c.key', 'dicom-tls-c.crt',  # Not trusted by Orthanc
+            '+cf', 'dicom-tls-a.crt',
+        ], stderr = FNULL))
+
+        self.assertRaises(Exception, lambda: subprocess.check_call([
+            FindExecutable('echoscu'),
+            ORTHANC['Server'], 
+            str(ORTHANC['DicomPort']),
+            '-aec', 'ORTHANC',
+            '+tls', 'dicom-tls-b.key', 'dicom-tls-b.crt',
+            '+cf', 'dicom-tls-b.crt',  # Not the certificate of Orthanc
+        ], stderr = FNULL))
+
+        
+    def test_outgoing_to_self(self):
+        u = UploadInstance(ORTHANC, 'DummyCT.dcm') ['ID']
+
+        # Error, as DICOM TLS is not enabled
+        DoPut(ORTHANC, '/modalities/self', {
+            'AET' : 'ORTHANC',
+            'Host' : ORTHANC['Server'],
+            'Port' : ORTHANC['DicomPort'],
+            })
+
+        self.assertRaises(Exception, lambda: DoPost(ORTHANC, '/modalities/self/store', u))
+
+        # Retry using DICOM TLS
+        DoPut(ORTHANC, '/modalities/self', {
+            'AET' : 'ORTHANC',
+            'Host' : ORTHANC['Server'],
+            'Port' : ORTHANC['DicomPort'],
+            'UseDicomTls' : True,
+            })
+
+        self.assertEqual(1, DoPost(ORTHANC, '/modalities/self/store', u) ['InstancesCount'])
+        
+        
+try:
+    print('\nStarting the tests...')
+    unittest.main(argv = [ sys.argv[0] ] + args.options)
+
+finally:
+    print('\nDone')