From 4fd7395c662c428548b16da0d3a706c98c68fd71 Mon Sep 17 00:00:00 2001
From: Lakr Aream <launchctl@outlook.com>
Date: Fri, 2 Sep 2022 16:11:14 +0800
Subject: [PATCH] updated validation

---
 generate_licenses.rb  | 28 +++++++++++++++++--------
 result.gitlab-license | 48 +++++++++++++++++++++----------------------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/generate_licenses.rb b/generate_licenses.rb
index 6fe9c24..87e25a9 100644
--- a/generate_licenses.rb
+++ b/generate_licenses.rb
@@ -1,26 +1,31 @@
-require 'openssl'
-require_relative 'lib/license.rb'
+# GitLab License Generator
 
 LICENSE_TARGET_PRIVATE_KEY = "license_key"
 LICENSE_TARGET_PUBLIC_KEY = "license_key.pub"
 TARGET_LICENSE_FILE = 'result.gitlab-license'
 
-puts "[i] gitlab license generator - core v2.2.1"
-puts ""
+puts "[*] Booting generator"
+
+require 'openssl'
+
+require_relative 'lib/license.rb'
+CORE_LIB_VERSION = '2.2.1'
+
+puts "[i] Using core library version #{CORE_LIB_VERSION}"
 
 if !File.exist?(LICENSE_TARGET_PRIVATE_KEY) || !File.exist?(LICENSE_TARGET_PUBLIC_KEY)
-  puts "[*] generating RSA keys..."
+  puts "[*] Generating RSA keys..."
   key = OpenSSL::PKey::RSA.new(2048)
   File.write(LICENSE_TARGET_PRIVATE_KEY, key.to_pem)
   File.write(LICENSE_TARGET_PUBLIC_KEY, key.public_key.to_pem)
 end
 
-puts "[*] loading RSA keys..."
+puts "[*] Loading RSA keys..."
 
 public_key = OpenSSL::PKey::RSA.new File.read(LICENSE_TARGET_PUBLIC_KEY)
 private_key = OpenSSL::PKey::RSA.new File.read(LICENSE_TARGET_PRIVATE_KEY)
 
-puts "[*] building license..."
+puts "[*] Building license..."
 
 Gitlab::License.encryption_key = private_key
 
@@ -54,15 +59,20 @@ license.restrictions      = {
   # required, just dont overflow
 }
 
-puts "[*] calling export"
+puts "[*] Calling export..."
 
 puts ""
 puts "====================================================="
 
+puts JSON.pretty_generate(JSON.parse(license.to_json))
+
+puts "====================================================="
+
 data = license.export
 File.open(TARGET_LICENSE_FILE, "w") { |f| f.write(data) }
 
 puts "====================================================="
 puts ""
 
-puts "[*] License generated successfully!"
\ No newline at end of file
+puts "[*] License generated successfully!"
+puts "[*] License file: #{TARGET_LICENSE_FILE}"
diff --git a/result.gitlab-license b/result.gitlab-license
index 3b7e5fb..6b8ee3a 100644
--- a/result.gitlab-license
+++ b/result.gitlab-license
@@ -1,24 +1,24 @@
-eyJkYXRhIjoiT2FaeExyaDhuOEk1dkFSK3d1akhsaWNudVUvSnJtS04veSs0
-anhSV3V4K2g0ZDNrMHgvNHlBVVordE0yXG5sU1FEZ1NUSE5xM3J3N2pYbzhQ
-V0JRM21JeDZ1VHRjdVROVlRyQ0FHNUV1STZFZzRzcFJCQzBQSjFjRHNcbis1
-V0s2UDhici9EMldKdytjbldSN3JqT0JqZndHcVB4NU9YZGlJMkV0clFFUHVy
-UnFsZDRjNGI1VXpNeVxuaWlDMy9pNGIwQlVWUXB4bUpRTDdCVXczVFB6c2FR
-cTBTam16cjFIaWF5TWJPaHE2ZytyVnd0aytGdE43XG52Q09DejVWSVVGTHJS
-NHNpQUVkWCtMMFNQR3FoRldTeElQODMwREdRcHFtbjdTNEtNRVZRT0FyR24r
-NlBcbnRTQTRTeDdubGpCakE1Z04zMWdzOXg2S1JnK0Y5dXlXRzBWMFlWazEv
-WmNrSFZXRkhLRVBKMEFhb3BvMVxuK25KM01UbmRmMW45dGVLMlJsMnRIR3RE
-TmJTUVJuT3VVUEE0U3hOUlNXYml6bkZSTVU1MlpDQ3o4SGhiXG5OQ2VsV01R
-WmdxSFZ5TWdxTVJud2lZT0pHLzBvUFhvSjhxdGtqSzErZGY2K3BCK3pFTlR1
-Z1lkVzhuTkVcbkJYTFZMSUF1di9USlVqeXJSckxmQTFqVTFzVjU0SkhHeGFq
-UUNGMFNDWklTNElyc2pxTnAzQ2NXWC9pZ1xuR0RmKzhPSWJuS1hhWkNubzNi
-MXQzZ3JFRnphVG9VOHFqdFlYdjlaVDM5Mk9OTmlWTnFDYUd6T2ZzcXJ0XG5I
-VmZUY0Rya0kxT0JPYTJMNE9JPVxuIiwia2V5IjoiRCtkSFFRY2pBK3hBR2d3
-TGFtbXdoZGR5VnpnUnRadzB6YkN4bXJES2JBOXZ2WU5iOS9vc2xBUGZqbCti
-XG5acFl5NTRydDNyVDlhNTRGaDF4NVBPcEtNenFMajhEVmlDR1hZVy9WaDVj
-NDRUazl6Q0FwZnAwOW1ua3Rcbm5QYktxR2MwV0E4ZmJnM092V0hHK0F6VDRL
-NklqMEZRRk1JRkpwZm9kTXY3MmRvUVNpSGxqVFJ6N0pkclxuWk1GeXE5UDBF
-SnNDWElqOUpiZFVmZFBqRGdlUWw5aFQwRXVvTUEwVjU1N3ZQQVpNenk1VTQz
-enlSTnBrXG4rWmJ3YUY0cXpmMEZwSXd2ZnpGL3MyYTU3VC9JeGZvd3dMVG5j
-NjJSYk45OWtGRlloQlhIc3dWSGdZN3VcbklOLzh0V2txdXJacU5zRGZ5N0RR
-RmtwTTAvLzF0ekt3RURwWktRdlc1QT09XG4iLCJpdiI6IjdmenVqb1RZV3VV
-MytQTzBkVS94c3c9PVxuIn0=
+eyJkYXRhIjoiOW5mNE9BaTBjYmxMendXbks4TGdDOWpDeVpNM1QzYzBNdzNs
+WS94WGlVR1o3UG9kNDNtWGlmSzJYcDNIXG5pWlc2UEhtVld0VFVUY3RabjF2
+Rk9wWXliZm1XUjM5dkxSQVhkVzJmcFBCQjd2eWwvY3kzaWF5dEdCZkxcblIx
+NWk4bmcvRlBpZ1Q2bXI1aFhoT1VKZm9xSHJ5RkE3NXV1b01IQkI0WHI4RGhl
+WVpsTEt6RmJueEZJdlxuRVkxZDk0Umd4d0dxcitqSDg0ZWMwKzhWcDFYaFEy
+NmhJWnpWMXRXWjY1Q2VVYVJ5TzJ2c2loeGhuRWRzXG5iOTVYWTZVaVJ6TlZs
+Ty8xaHByY3A1eklBVzBJQ0lwM2c3anR2SEtCWExuUkxnUDJucTN0UkhWNXM5
+T2dcbllmVkhseUZqZjRvclFpeGc1TEFVZmcwR0R6N0pDck9oc0xtWUZxTXQw
+SkZkamQ5YlhGU21OdzhkN2x4M1xuWU12MitXbS9zZ1ZiQzVFa1VJWExSaHlH
+bThjRjZNbEoya3N3MCttREVlNDFCem1ncHVWWWpyT01DQlJFXG56My9DSWRV
+dnFqY0ljTFFYYUdFajRTNmJtdjVxTXhYQTZiR3Bkd2orTVM4Y0doYjhGVENS
+UWVsRVlSVGVcbnZ1Z3lJdnZ6V2dYQWtCZk5NTU9Rd2JmMHFmOVJNK3FyN2lQ
+VXkxRWlYU2hDaHloTDhnV3BNc1FvVVNUNVxuSHZDcEE1Y2dPUmV1dC9YS1RH
+OHRIMFRJR2RmNjRDd3pFeENQKzN4QWJmM3IrSDJrZlhzaTFJWVhya25CXG5u
+aFhGTm83Q1doNUFJVWd1SmdnPVxuIiwia2V5IjoiT3huRG1YTEozcXVOZita
+K2lvU3RQMm5wa2U2K2ZMNVBpdEtJSkNkTUhNeTlHTmdhTVNoNnZlbERaUExz
+XG5JK3dJaHlEZ09vc2k0OEM4Tmp6Q29oL05mV3gybDJGRmxRSkFQLytRdGd4
+eDJiRnpFRlF5bk0zc0dnRUtcbkZRUkQzUGNTWkpzZGtXdkltWGEzWnlsMEg2
+WEtGelgrTnE0cGhqWktuQ1dneXk3dGU4YWI5Qm5ZNVBlYVxuWUNPL1I0SGpI
+MkhKTnhmamd2TWh0YThMNXgrbmt2RXhBODFIRDFsQlVXZzJlQi92RzZjblg0
+YkRPRWF3XG5tVHJpMS9VLzRVcVVoQnRSYklVSnZZeGFCMC9hT3owaStLVkdw
+SENSTCs3OXQveHA1NVg2bkRQWlhwdGdcbkE0WXJrbFVHUlF0RnZyMjRRMGxa
+TndrS2Z4eU1pOWkrclgrVzVIa1MvQT09XG4iLCJpdiI6Im1FL1RodjE4MWJQ
+eGNFaWVwdEhCWnc9PVxuIn0=