From: Plamen Dimitrov Date: Thu, 12 May 2022 05:06:35 +0000 (+0300) Subject: Sanitize all collected default values to empty fields X-Git-Tag: v1.7.1~3^2~6^2~3 X-Git-Url: http://developer.intra2net.com/git/?p=pyi2ncommon;a=commitdiff_plain;h=be8c26c19d4431d0a851881376940077a7880620 Sanitize all collected default values to empty fields All values are better off being empty rather than filled with noisy sample data that could be wrongfully introduced on the user side. --- diff --git a/src/cnfvar/templates.py b/src/cnfvar/templates.py index 9c39520..8468c68 100644 --- a/src/cnfvar/templates.py +++ b/src/cnfvar/templates.py @@ -67,7 +67,7 @@ user_defaults = { # always a member of the 'Alle' group "USER_GROUP_MEMBER_REF": "2", "USER_LOCALE": "", - "USER_PASSWORD": "test1234", + "USER_PASSWORD": "", "USER_TRASH_DELETEDAYS": "30", "USER_WEBMAIL_MESSAGES_PER_PAGE": "25", "USER_WEBMAIL_SIGNATURE": "", @@ -93,8 +93,8 @@ intraclient_defaults = { #: UI defaults for a NIC instance nic_defaults = { "NIC_COMMENT": "", - "NIC_DRIVER": "virtio_net", - "NIC_MAC": "02:00:00:00:20:00", + "NIC_DRIVER": "", + "NIC_MAC": "", "NIC_TYPE": "UNUSED", } #: UI defaults for a provider instance @@ -145,25 +145,27 @@ proxy_accesslist_defaults = { } #: UI defaults for a key instance key_own_defaults = { - "KEY_OWN_FINGERPRINT_MD5": "76:3B:CF:8E:CB:BF:A5:7D:CC:87:39:FA:CE:99:2E:96", - "KEY_OWN_FINGERPRINT_SHA1": "ED:5A:C6:D9:5B:BE:47:1F:B9:4F:CF:A3:80:3B:42:08:F4:00:16:96", - "KEY_OWN_ID_X509": "CN=some.net.lan", - "KEY_OWN_ISSUER": "CN=ab, C=fd, L=ab, ST=ab, O=ab, OU=ab/emailAddress=ab@ab.com", + "KEY_OWN_FINGERPRINT_MD5": "", + "KEY_OWN_FINGERPRINT_SHA1": "", + "KEY_OWN_ID_X509": "CN=net.lan", + "KEY_OWN_ISSUER": "CN=, C=, L=, ST=, O=, OU=", "KEY_OWN_KEYSIZE": "2048", "KEY_OWN_HASH_ALGO": "SHA2_256", - "KEY_OWN_PRIVATE_KEY": "-----BEGIN PRIVATE KEY-----\\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKk" + - "ZTzqHXg41RZMiY+ywRZ037pBq8J3BkH\\n-----END PRIVATE KEY-----\\n", - "KEY_OWN_PUBLIC_KEY": "-----BEGIN CERTIFICATE-----\\nMIIFCTCCAvGgAwIBAgIEVBGDuTANBgkqhkiG" + - "9w0BAQsFADCBgTEPMA0GA1UEAwwG\\n-----END CERTIFICATE-----\\n", - "KEY_OWN_REQUEST": "-----BEGIN CERTIFICATE REQUEST-----\\nMIIDCzCCAfMCAQAwIjEgMB4GA1UEAww" + - "XaW50cmFkZXYtYWllc\\n-----END CERTIFICATE REQUEST-----\\n", - "KEY_OWN_SUBJECT": "CN=some.net.lan", - "KEY_OWN_VALIDFROM": "20140911T111257", - "KEY_OWN_VALIDTILL": "20160731T134608", + # TODO: the key own creation is currently too hacky for better sanitized defaults + "KEY_OWN_PRIVATE_KEY": "", + # TODO: the key own creation is currently too hacky for better sanitized defaults + "KEY_OWN_PUBLIC_KEY": "", + # TODO: the key own creation is currently too hacky for better sanitized defaults + "KEY_OWN_REQUEST": "", + "KEY_OWN_SUBJECT": "CN=net.lan", + # TODO: the key own creation is currently too hacky for better sanitized defaults + "KEY_OWN_VALIDFROM": "00001122T445566", + # TODO: the key own creation is currently too hacky for better sanitized defaults + "KEY_OWN_VALIDTILL": "99991122T445566", "KEY_OWN_TYPE": "SELF", # the ones bellow should be set when using 'generate' to create the key - "KEY_OWN_CREATE_CN": "somehost", - "KEY_OWN_CREATE_EMAIL": "default@intra2net.com" + "KEY_OWN_CREATE_CN": "", + "KEY_OWN_CREATE_EMAIL": "" } #: UI defaults for a VPN connection instance vpnconn_defaults = { @@ -181,7 +183,7 @@ vpnconn_defaults = { "VPNCONN_LAN_NAT_MODE": "UNMODIFIED", "VPNCONN_LAN_NAT_NETWORK": "", "VPNCONN_LAN_NIC_REF": "2", - "VPNCONN_LAN_NET": "172.17.0.0", + "VPNCONN_LAN_NET": "", "VPNCONN_LAN_NETMASK": "255.255.0.0", "VPNCONN_LAN_TYPE": "NIC", "VPNCONN_LIFETIME_IKE": "480", @@ -197,10 +199,10 @@ vpnconn_defaults = { "VPNCONN_PSK_OWN_ID": "", "VPNCONN_PSK_OWN_ID_TYPE": "IP", "VPNCONN_REMOTE_INET_NAT": "1", - "VPNCONN_REMOTE_MODECONFIG_IP": "192.168.99.1", + "VPNCONN_REMOTE_MODECONFIG_IP": "", "VPNCONN_REMOTE_NAT_ENABLE": "0", "VPNCONN_REMOTE_NAT_NETWORK": "", - "VPNCONN_REMOTE_NET": "172.18.0.0", + "VPNCONN_REMOTE_NET": "", "VPNCONN_REMOTE_NETMASK": "255.255.0.0", "VPNCONN_REMOTE_TYPE": "CUSTOM", "VPNCONN_RETRIES": "3",