diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md index b958f0f92ba1..13835e756ace 100644 --- a/docs/development/build-instructions-linux.md +++ b/docs/development/build-instructions-linux.md @@ -12,7 +12,7 @@ Follow the guidelines below for building Electron on Linux. For a quick test, run the following script: ```sh - $ npm run check-tls + $ npx @electron/check-python-tls ``` If the script returns that your configuration is using an outdated security diff --git a/docs/development/build-instructions-macos.md b/docs/development/build-instructions-macos.md index ad1488188d37..88912e51c041 100644 --- a/docs/development/build-instructions-macos.md +++ b/docs/development/build-instructions-macos.md @@ -15,7 +15,7 @@ Please also ensure that your system and Python version support at least TLS 1.2. This depends on both your version of macOS and Python. For a quick test, run: ```sh -$ npm run check-tls +$ npx @electron/check-python-tls ``` If the script returns that your configuration is using an outdated security diff --git a/package.json b/package.json index 5903e0d4bc5d..67f09ad542d0 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "private": true, "scripts": { "asar": "asar", - "check-tls": "python ./script/tls.py", "generate-version-json": "node script/generate-version-json.js", "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs", "lint:js": "node ./script/lint.js --js", diff --git a/script/lib/tls/index.js b/script/lib/tls/index.js deleted file mode 100644 index a53084ccf39f..000000000000 --- a/script/lib/tls/index.js +++ /dev/null @@ -1,18 +0,0 @@ -const fs = require('fs') -const https = require('https') -const path = require('path') - -const server = https.createServer({ - key: fs.readFileSync(path.resolve(__dirname, 'tls.key.pem')), - cert: fs.readFileSync(path.resolve(__dirname, 'tls.cert.pem')) -}, (req, res) => { - res.end(JSON.stringify({ protocol: req.socket.getProtocol() })) - - setTimeout(() => { - server.close() - }, 0) -}) - -server.listen(0, () => { - console.log(server.address().port) -}) diff --git a/script/lib/tls/tls.cert.pem b/script/lib/tls/tls.cert.pem deleted file mode 100644 index f77ce995190e..000000000000 --- a/script/lib/tls/tls.cert.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDZDCCAkwCCQDw+ZvdiZ6UJTANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJB -VTETMBEGA1UECAwKU29tZS1TdGF0ZTEdMBsGA1UECgwURE8gTk9UIFVTRSBUSElT -IENFUlQxHTAbBgNVBAsMFFRISVMgQ0VSVCBJUyBVU0VMRVNTMRIwEAYDVQQDDAlk -ZWFkLmNlcnQwHhcNMTgwNjIwMDY0OTE2WhcNMTkwNjIwMDY0OTE2WjB0MQswCQYD -VQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEdMBsGA1UECgwURE8gTk9UIFVT -RSBUSElTIENFUlQxHTAbBgNVBAsMFFRISVMgQ0VSVCBJUyBVU0VMRVNTMRIwEAYD -VQQDDAlkZWFkLmNlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9 -0UnRjuXgIO1no5xFCugzcje1GlDd88AJCJyxySOJZhpry1S9mtrM0iQvGb+v9ixq -mLuMBEsG1mvjECD6mFREHHK2NHFuSnfKtZkkzb3/turSEvmiRCXD+X0N+knuXjjl -P6eo+hiGhhkDYHxz19e66ecVAYQThkQinZDU0l0rMbEMB9fKwcgiC9vG6tE7fE4i -z3WLhT+LBS02qkJGLGIyCnOsJMMBoXpAV0DwB2CA05vTP8SrrllMg2Q4YAFhxAZl -f/YHeJsvVyhbbw/k+oPypgdKRjYSCwSFgllOADVBv5gJ6lWt3to7B/HpFh9pTNuA -12go7AJ2tBrIBj485P7HAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALWyR7u+Tcde -U1kwitc6cJYwE2uZZS8+f5L3WLouoAw4Jr0GlqO9uZC8lwMbvO5tRN1khV8HdZ8k -c/qoY/fwzW0qNjDDfz9tev73iu8SlL4iu9g9CDlISIFZlqmBr+g3Szw/l2ghud3a -bogwgsZjWlODWFsJJE9gBKSzh2oiDDYa4PWkrkTg8VUe/8BLUc2ijKc6KXPPR72V -iDXqKmM3S+Pa6a/evJo1z0KxsbSqs/ErIzY7JxSPG6Gw7NMYD6QmoJhNePicarIA -LRFZqTFfi8v7Dmj58WI9BN1dkGtzTpYM4RL4gjmQmTf7J+mpgPDH9pi1pB1NZwxN -pJmyETQUqDA= ------END CERTIFICATE----- diff --git a/script/lib/tls/tls.key.pem b/script/lib/tls/tls.key.pem deleted file mode 100644 index 84a77b70603a..000000000000 --- a/script/lib/tls/tls.key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAvdFJ0Y7l4CDtZ6OcRQroM3I3tRpQ3fPACQicsckjiWYaa8tU -vZrazNIkLxm/r/Ysapi7jARLBtZr4xAg+phURBxytjRxbkp3yrWZJM29/7bq0hL5 -okQlw/l9DfpJ7l445T+nqPoYhoYZA2B8c9fXuunnFQGEE4ZEIp2Q1NJdKzGxDAfX -ysHIIgvbxurRO3xOIs91i4U/iwUtNqpCRixiMgpzrCTDAaF6QFdA8AdggNOb0z/E -q65ZTINkOGABYcQGZX/2B3ibL1coW28P5PqD8qYHSkY2EgsEhYJZTgA1Qb+YCepV -rd7aOwfx6RYfaUzbgNdoKOwCdrQayAY+POT+xwIDAQABAoIBAEDIT/hMW9odgsjP -RwMtUMhWH/sYKydFDHJI1Sm8Kvu2tCe78oTvd+NViPHmSMymKMyMqd2EjZKc1Z9e -HtNH7+J7Dw9uYJQyqCWvyr+L1F+UrxnZTgd6WKVE3dBKbrcCw0pCalc6W+p1k83a -PT9QGBl7wNkjdk8vkMt7mTV5QkD+El20bsxhgVptS/SOgcRZha5HHC074b/WU0lr -gXm+9Bmh3ND/FRF8rE2FEd8JjmEOioidpv/RaQyuj3Zc3Wf4cex7JLkhlpWaxriz -5WxnIURtRDYruP1kjvACQGYnpBsBPA86vsRk03/vKpjmcklYDNbzc2uU7IWRmMsh -VXILl7kCgYEA9BQogsCOyxiHwIcG7d7n8eG8UrBeFVTCOKabQCVX4jr2d6JbFGCX -7BHTaSoN7QU1fmBJXp8+LckQ2TLKYKfGVzgyKjymJYgm4DE4r39jaHln+llHLOOW -RiC+IC2npCYEsE+8A4wlOqi02srSVIriOT8tbZSSxnC8C+tkBANc4pUCgYEAxxas -onV5RyK7/XhhKofueEw8h3IvrjQzVLUQZ+XtTcsJVcuAwEhoJ4Ckpwaou69i4M8y -+OZJLUlU/UJykrgdmGmwcSE+Ncv7RjyQVhHThSSV+n9vdmdm+Jk93Eya4PG7oCF6 -a+qtXdH/1IQ4YRTBbxKQDPjQCXC4G7fbqlzdAOsCgYEAmtsfSLW64whROMlykADY -0BIUVbIoPwhjoWWzImOO+q3GKekMOEWAnfpBU3unEjY31lJoumv2Gz5yPhuHYwOP -R08UJNAN6coUQDF6cX41J9e/LIrwKX7LnPqxJeFRd0fXubUc6HNGO41GEXqVL6Ze -GUwIGnolFVn5NObHsfQgPnECgYBAf6gOOeDAmxAsXgOcs80eTBSQDP5FgcPffYmD -H4px2YV8tiFQKiUUJykws4eWxotSKc5ptLGgalGOeyiDQALWjecLv6lX5G3To2tf -dwb/64prTT3fLkC96WeRJ4BFwAr5Jd9zduQTsSUgxHU/fmnsgicJDNLZPBtpX3db -ChrPYQKBgCbZCntXj6MkGZSNZ5IlNynl2XmPa9kN+ztCrTPPP3imAZgcDmROUjj+ -0eZiCjX/GJTO5uLSFtZxl3YnpWZsJJZSwnwPwEEo3+t5ves2dG+oJbeWLbj7xxE5 -LX934fWHWUof/qDY38/2Mu6+uu7IpNZlfAJ/hsjDE9pw8f0D6Xa+ ------END RSA PRIVATE KEY----- diff --git a/script/tls.py b/script/tls.py deleted file mode 100644 index 316cdd930029..000000000000 --- a/script/tls.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python - -from __future__ import print_function -import json -import os -import ssl -import subprocess -import sys -import urllib2 - -ctx = ssl.create_default_context() -ctx.check_hostname = False -ctx.verify_mode = ssl.CERT_NONE - -def check_tls(verbose): - process = subprocess.Popen( - 'node lib/tls', - cwd=os.path.dirname(os.path.realpath(__file__)), - shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) - - port = process.stdout.readline() - localhost_url = 'https://localhost:' + port - - response = json.load(urllib2.urlopen(localhost_url, context=ctx)) - tls = response['protocol'] - process.wait() - - if sys.platform == "linux" or sys.platform == "linux2": - tutorial = "./docs/development/build-instructions-linux.md" - elif sys.platform == "darwin": - tutorial = "./docs/development/build-instructions-macos.md" - elif sys.platform == "win32": - tutorial = "./docs/development/build-instructions-windows.md" - else: - tutorial = "build instructions for your operating system" \ - + "in ./docs/development/" - - if tls == "TLSv1" or tls == "TLSv1.1": - print("Your system/python combination is using an outdated security" \ - + "protocol and will not be able to compile Electron. Please see " \ - + tutorial + "." \ - + "for instructions on how to update Python.") - sys.exit(1) - else: - if verbose: - print("Your Python is using " + tls + ", which is sufficient for " \ - + "building Electron.") - -if __name__ == '__main__': - check_tls(True) - sys.exit(0)