diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92f682a383d0..8ba3939529b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -421,7 +421,7 @@ variables: variables: DEPLOY_USER: reposync DEPLOY_HOST: web.inverse.ca - GITLAB_DEPLOY_DIR: ${CI_PIPELINE_ID} + PPA_ID: ${CI_PIPELINE_ID} tags: - shell @@ -1541,6 +1541,7 @@ deploy_devel_pkg_friendly_names: # PKG_DEST_NAME: # PF_EXPORT_RPM_DEST_NAME: # PF_EXPORT_DEB_DEST_NAME: + PF_CI_LIB_DEB_DEST_NAME: packetfence-ci-lib_devel.deb deploy_branches_pkg_friendly_names: extends: @@ -1552,6 +1553,7 @@ deploy_branches_pkg_friendly_names: PKG_DEST_NAME: packetfence-release-branches.el8.noarch.rpm PF_EXPORT_RPM_DEST_NAME: packetfence-export-branches.el8.noarch.rpm PF_EXPORT_DEB_DEST_NAME: packetfence-export_branches.deb + PF_CI_LIB_DEB_DEST_NAME: packetfence-ci-lib_branches.deb deploy_release_pkg_friendly_names: extends: diff --git a/NEWS.asciidoc b/NEWS.asciidoc index c29b3b9b7a0c..9c017e2e11ca 100644 --- a/NEWS.asciidoc +++ b/NEWS.asciidoc @@ -27,15 +27,32 @@ For a list of compatibility related changes see the < # diff --git a/addons/captive-portal/proxy-bypass/squid-redirector.pl b/addons/captive-portal/proxy-bypass/squid-redirector.pl index 58a5887cf614..57762a067926 100755 --- a/addons/captive-portal/proxy-bypass/squid-redirector.pl +++ b/addons/captive-portal/proxy-bypass/squid-redirector.pl @@ -58,7 +58,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/bin/generator-data-access-layer.pl b/addons/dev-helpers/bin/generator-data-access-layer.pl old mode 100644 new mode 100755 index ea299df35611..b181bc23446a --- a/addons/dev-helpers/bin/generator-data-access-layer.pl +++ b/addons/dev-helpers/bin/generator-data-access-layer.pl @@ -204,7 +204,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/bin/generator-template-switches-defaults.pl b/addons/dev-helpers/bin/generator-template-switches-defaults.pl index 8d3b5cd7770e..0dac91eb62d3 100755 --- a/addons/dev-helpers/bin/generator-template-switches-defaults.pl +++ b/addons/dev-helpers/bin/generator-template-switches-defaults.pl @@ -85,7 +85,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/bin/generator-unified-api-config.pl b/addons/dev-helpers/bin/generator-unified-api-config.pl old mode 100644 new mode 100755 diff --git a/addons/dev-helpers/bin/switch_options.pl b/addons/dev-helpers/bin/switch_options.pl old mode 100644 new mode 100755 index 00f880202eeb..c406674c7c57 --- a/addons/dev-helpers/bin/switch_options.pl +++ b/addons/dev-helpers/bin/switch_options.pl @@ -321,7 +321,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/bin/switch_options_table.pl b/addons/dev-helpers/bin/switch_options_table.pl old mode 100644 new mode 100755 index c4dc0506fc0b..4391ee4a5539 --- a/addons/dev-helpers/bin/switch_options_table.pl +++ b/addons/dev-helpers/bin/switch_options_table.pl @@ -372,7 +372,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/centos-chroot/make_chroot.sh b/addons/dev-helpers/centos-chroot/make_chroot.sh index 2150b6da7eb8..c37abd828633 100644 --- a/addons/dev-helpers/centos-chroot/make_chroot.sh +++ b/addons/dev-helpers/centos-chroot/make_chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Creates a chroot environment that it suitable for testing # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Author: Inverse inc. # diff --git a/addons/dev-helpers/git/pre-commit.pl b/addons/dev-helpers/git/pre-commit.pl index a6984a33792d..59d6ea4e5372 100755 --- a/addons/dev-helpers/git/pre-commit.pl +++ b/addons/dev-helpers/git/pre-commit.pl @@ -214,7 +214,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/radius-hook.pl b/addons/dev-helpers/radius-hook.pl index 4142beb10968..7611d48f991c 100755 --- a/addons/dev-helpers/radius-hook.pl +++ b/addons/dev-helpers/radius-hook.pl @@ -36,7 +36,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/templates/unittest-UnifiedApi-Controller-Config.t.tt b/addons/dev-helpers/templates/unittest-UnifiedApi-Controller-Config.t.tt index 6e61a0b1f2e4..f5cc98ef1953 100644 --- a/addons/dev-helpers/templates/unittest-UnifiedApi-Controller-Config.t.tt +++ b/addons/dev-helpers/templates/unittest-UnifiedApi-Controller-Config.t.tt @@ -53,7 +53,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dev-helpers/vim/perl-support-templates/comments.templates b/addons/dev-helpers/vim/perl-support-templates/comments.templates index e7b85227197d..f50521f05ea8 100644 --- a/addons/dev-helpers/vim/perl-support-templates/comments.templates +++ b/addons/dev-helpers/vim/perl-support-templates/comments.templates @@ -46,7 +46,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE @@ -90,7 +90,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE @@ -154,7 +154,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE @@ -191,7 +191,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/dhcp_dumper.pl b/addons/dhcp_dumper.pl index 3c3fdabfabb5..619f26ae5ebe 100755 --- a/addons/dhcp_dumper.pl +++ b/addons/dhcp_dumper.pl @@ -239,7 +239,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. Copyright (C) 2005 Kevin Amorin diff --git a/addons/extract_i18n_strings.pl b/addons/extract_i18n_strings.pl index 4d58d1665f45..ffd93cfb3902 100755 --- a/addons/extract_i18n_strings.pl +++ b/addons/extract_i18n_strings.pl @@ -448,7 +448,7 @@ sub print_po { print < # diff --git a/addons/high-availability/rdiff b/addons/high-availability/rdiff index a355cebd7b9b..b70d2ee3d0a9 100755 --- a/addons/high-availability/rdiff +++ b/addons/high-availability/rdiff @@ -2,7 +2,7 @@ # # Convenient little wrapper to remotely diff files # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Author: Inverse inc. # diff --git a/addons/import-node-csv.pl b/addons/import-node-csv.pl index 5dd86e365283..388855ffb3ac 100755 --- a/addons/import-node-csv.pl +++ b/addons/import-node-csv.pl @@ -111,7 +111,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/integration-testing/replay-snmptrapd-logs.pl b/addons/integration-testing/replay-snmptrapd-logs.pl index 599fb741d9ae..3423367ba528 100755 --- a/addons/integration-testing/replay-snmptrapd-logs.pl +++ b/addons/integration-testing/replay-snmptrapd-logs.pl @@ -19,7 +19,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/locationlog-cleanup.pl b/addons/locationlog-cleanup.pl index b0f7897c0a44..289d2e6e51f8 100755 --- a/addons/locationlog-cleanup.pl +++ b/addons/locationlog-cleanup.pl @@ -49,7 +49,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/packages/packetfence-rpm-build.sh b/addons/packages/packetfence-rpm-build.sh index 87587cc1eaa1..5fcac6a34a7e 100755 --- a/addons/packages/packetfence-rpm-build.sh +++ b/addons/packages/packetfence-rpm-build.sh @@ -5,7 +5,7 @@ # - building directly from git # - specifying branch to build # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Author: Inverse inc. # diff --git a/addons/packages/perl-Net-Appliance-Session.spec.diff b/addons/packages/perl-Net-Appliance-Session.spec.diff index a6e29cda439e..c1d1bf96a7bd 100644 --- a/addons/packages/perl-Net-Appliance-Session.spec.diff +++ b/addons/packages/perl-Net-Appliance-Session.spec.diff @@ -7,7 +7,7 @@ # http://packetfence.org/bugs/view.php?id=1556 # # Olivier Bilodeau -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # --- perl-Net-Appliance-Session.spec 2012-09-26 13:40:14.000000000 -0400 +++ SPECS/perl-Net-Appliance-Session.spec 2012-09-26 13:38:08.000000000 -0400 diff --git a/addons/pfconfig/comparator/comparator.pl b/addons/pfconfig/comparator/comparator.pl index b0cf336e7464..226e23930ff7 100755 --- a/addons/pfconfig/comparator/comparator.pl +++ b/addons/pfconfig/comparator/comparator.pl @@ -78,7 +78,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/pfconfig/comparator/config-comparator.sh b/addons/pfconfig/comparator/config-comparator.sh index 17e22de1526a..f8ba9cba5ecc 100755 --- a/addons/pfconfig/comparator/config-comparator.sh +++ b/addons/pfconfig/comparator/config-comparator.sh @@ -5,7 +5,7 @@ # - This will compare the generated configuration in different modules in two different branches. # - Note that the pfconfig data that is seen is the one running in the service # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Author: Inverse inc. # diff --git a/addons/replay-pcap.pl b/addons/replay-pcap.pl index 364dd90e57ab..205649331ef0 100755 --- a/addons/replay-pcap.pl +++ b/addons/replay-pcap.pl @@ -174,7 +174,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/sourcefire/pfdetect.pl b/addons/sourcefire/pfdetect.pl index d64ef5526ae0..000a6713d279 100755 --- a/addons/sourcefire/pfdetect.pl +++ b/addons/sourcefire/pfdetect.pl @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Authors: Inverse inc. # diff --git a/addons/upgrade/add-default-params-to-auth.pl b/addons/upgrade/add-default-params-to-auth.pl index 8c219963324c..45fd127ae1c3 100755 --- a/addons/upgrade/add-default-params-to-auth.pl +++ b/addons/upgrade/add-default-params-to-auth.pl @@ -89,7 +89,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/move-logos-to-profile-templates.pl b/addons/upgrade/move-logos-to-profile-templates.pl index 7129da802ab9..c71000a1a748 100644 --- a/addons/upgrade/move-logos-to-profile-templates.pl +++ b/addons/upgrade/move-logos-to-profile-templates.pl @@ -165,7 +165,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.0-filter_engines.pl b/addons/upgrade/to-10.0-filter_engines.pl index 107388c47e88..1f7fef350c38 100755 --- a/addons/upgrade/to-10.0-filter_engines.pl +++ b/addons/upgrade/to-10.0-filter_engines.pl @@ -318,7 +318,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.1-authentication-prefix.pl b/addons/upgrade/to-10.1-authentication-prefix.pl index 1b1c1c638cd9..b0b5470b163e 100755 --- a/addons/upgrade/to-10.1-authentication-prefix.pl +++ b/addons/upgrade/to-10.1-authentication-prefix.pl @@ -81,7 +81,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.1-move-radius-configuration-parmeters.pl b/addons/upgrade/to-10.1-move-radius-configuration-parmeters.pl index 1c6ff39a1088..d5a063fb69ac 100755 --- a/addons/upgrade/to-10.1-move-radius-configuration-parmeters.pl +++ b/addons/upgrade/to-10.1-move-radius-configuration-parmeters.pl @@ -104,7 +104,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.1-radius-filter-template.pl b/addons/upgrade/to-10.1-radius-filter-template.pl index 79b81a494c9a..29b2e184cf30 100755 --- a/addons/upgrade/to-10.1-radius-filter-template.pl +++ b/addons/upgrade/to-10.1-radius-filter-template.pl @@ -79,7 +79,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.1-realm-conf.pl b/addons/upgrade/to-10.1-realm-conf.pl index c0cf793d2f88..67e865ca3489 100755 --- a/addons/upgrade/to-10.1-realm-conf.pl +++ b/addons/upgrade/to-10.1-realm-conf.pl @@ -36,7 +36,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.1-rule-status.pl b/addons/upgrade/to-10.1-rule-status.pl index 3317a232cd70..abbd47329295 100755 --- a/addons/upgrade/to-10.1-rule-status.pl +++ b/addons/upgrade/to-10.1-rule-status.pl @@ -115,7 +115,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.2-adminroles-conf.pl b/addons/upgrade/to-10.2-adminroles-conf.pl index 782778101c08..80caee6440e6 100755 --- a/addons/upgrade/to-10.2-adminroles-conf.pl +++ b/addons/upgrade/to-10.2-adminroles-conf.pl @@ -55,7 +55,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.2-default-switch-packetfence-standard.pl b/addons/upgrade/to-10.2-default-switch-packetfence-standard.pl index 5361e718638b..7730cf2e8b90 100755 --- a/addons/upgrade/to-10.2-default-switch-packetfence-standard.pl +++ b/addons/upgrade/to-10.2-default-switch-packetfence-standard.pl @@ -75,7 +75,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.2-pfdetect-conf.pl b/addons/upgrade/to-10.2-pfdetect-conf.pl index 2da283f4c3bc..334a1b16fa0f 100755 --- a/addons/upgrade/to-10.2-pfdetect-conf.pl +++ b/addons/upgrade/to-10.2-pfdetect-conf.pl @@ -47,7 +47,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.2-pfmon-maintenance.pl b/addons/upgrade/to-10.2-pfmon-maintenance.pl index 85210d1d6ec1..2a5a192cb047 100755 --- a/addons/upgrade/to-10.2-pfmon-maintenance.pl +++ b/addons/upgrade/to-10.2-pfmon-maintenance.pl @@ -122,7 +122,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.2-selfservice-conf.pl b/addons/upgrade/to-10.2-selfservice-conf.pl index c0ed418f3609..26378111cb99 100755 --- a/addons/upgrade/to-10.2-selfservice-conf.pl +++ b/addons/upgrade/to-10.2-selfservice-conf.pl @@ -49,7 +49,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.3-network-conf.pl b/addons/upgrade/to-10.3-network-conf.pl index c66e7b2b3150..139298757c55 100755 --- a/addons/upgrade/to-10.3-network-conf.pl +++ b/addons/upgrade/to-10.3-network-conf.pl @@ -47,7 +47,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-10.3-provisioners-windows_agent_download_uri.pl b/addons/upgrade/to-10.3-provisioners-windows_agent_download_uri.pl index 058c71f2a3fc..d99eedccdb21 100755 --- a/addons/upgrade/to-10.3-provisioners-windows_agent_download_uri.pl +++ b/addons/upgrade/to-10.3-provisioners-windows_agent_download_uri.pl @@ -44,7 +44,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.0-firewall_sso-conf.pl b/addons/upgrade/to-11.0-firewall_sso-conf.pl index 9b0190cb5e3e..6c8dad2d246a 100755 --- a/addons/upgrade/to-11.0-firewall_sso-conf.pl +++ b/addons/upgrade/to-11.0-firewall_sso-conf.pl @@ -50,7 +50,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.0-no-slash-32-switches.pl b/addons/upgrade/to-11.0-no-slash-32-switches.pl index c26363a3bd6c..e20a57f64452 100755 --- a/addons/upgrade/to-11.0-no-slash-32-switches.pl +++ b/addons/upgrade/to-11.0-no-slash-32-switches.pl @@ -66,7 +66,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.0-openid-username_attribute.pl b/addons/upgrade/to-11.0-openid-username_attribute.pl index 5a32552c2d23..86d4f5b4209e 100755 --- a/addons/upgrade/to-11.0-openid-username_attribute.pl +++ b/addons/upgrade/to-11.0-openid-username_attribute.pl @@ -62,7 +62,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.1-cleanup-ntlm-cache-batch-fields.pl b/addons/upgrade/to-11.1-cleanup-ntlm-cache-batch-fields.pl index 806ed38d21aa..1636655ff343 100755 --- a/addons/upgrade/to-11.1-cleanup-ntlm-cache-batch-fields.pl +++ b/addons/upgrade/to-11.1-cleanup-ntlm-cache-batch-fields.pl @@ -58,7 +58,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.1-remove-unused-sources.pl b/addons/upgrade/to-11.1-remove-unused-sources.pl index 7ab9fc7bb3e5..fb4fb6821cd5 100755 --- a/addons/upgrade/to-11.1-remove-unused-sources.pl +++ b/addons/upgrade/to-11.1-remove-unused-sources.pl @@ -165,7 +165,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.1-remove-wmi-scan.pl b/addons/upgrade/to-11.1-remove-wmi-scan.pl index 6679140c5c7d..8a1efa37de1b 100755 --- a/addons/upgrade/to-11.1-remove-wmi-scan.pl +++ b/addons/upgrade/to-11.1-remove-wmi-scan.pl @@ -114,7 +114,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.1-update-reports.pl b/addons/upgrade/to-11.1-update-reports.pl index ee1ad01d8bff..9f78c17282d5 100755 --- a/addons/upgrade/to-11.1-update-reports.pl +++ b/addons/upgrade/to-11.1-update-reports.pl @@ -63,7 +63,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.2-pfcron-populate_ntlm_redis_cache.pl b/addons/upgrade/to-11.2-pfcron-populate_ntlm_redis_cache.pl index cdb51142212b..a193a0313c83 100755 --- a/addons/upgrade/to-11.2-pfcron-populate_ntlm_redis_cache.pl +++ b/addons/upgrade/to-11.2-pfcron-populate_ntlm_redis_cache.pl @@ -44,7 +44,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2021 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-11.2-pfcron.pl b/addons/upgrade/to-11.2-pfcron.pl index 766e46b8b429..77cada174ca5 100755 --- a/addons/upgrade/to-11.2-pfcron.pl +++ b/addons/upgrade/to-11.2-pfcron.pl @@ -43,7 +43,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2021 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-12.0-authentication.pl b/addons/upgrade/to-12.0-authentication.pl index 3097b6e56f3c..898c8301c615 100755 --- a/addons/upgrade/to-12.0-authentication.pl +++ b/addons/upgrade/to-12.0-authentication.pl @@ -54,7 +54,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-12.0-remove-tenant.pl b/addons/upgrade/to-12.0-remove-tenant.pl index 153213b839f3..fadf7a2da085 100755 --- a/addons/upgrade/to-12.0-remove-tenant.pl +++ b/addons/upgrade/to-12.0-remove-tenant.pl @@ -105,7 +105,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-12.0-rename-log-files.pl b/addons/upgrade/to-12.0-rename-log-files.pl index 395605b65751..d48a81192cb6 100755 --- a/addons/upgrade/to-12.0-rename-log-files.pl +++ b/addons/upgrade/to-12.0-rename-log-files.pl @@ -68,7 +68,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-12.0-use-proxysql.pl b/addons/upgrade/to-12.0-use-proxysql.pl index bb41d725f86b..37fe296c4688 100755 --- a/addons/upgrade/to-12.0-use-proxysql.pl +++ b/addons/upgrade/to-12.0-use-proxysql.pl @@ -52,7 +52,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-12.1-eduroam-migration.pl b/addons/upgrade/to-12.1-eduroam-migration.pl index c2bbc591be5e..ab08c8dec643 100755 --- a/addons/upgrade/to-12.1-eduroam-migration.pl +++ b/addons/upgrade/to-12.1-eduroam-migration.pl @@ -73,7 +73,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-12.1-move-rolebyname-to-vpnbyname-fortigate.pl b/addons/upgrade/to-12.1-move-rolebyname-to-vpnbyname-fortigate.pl index 6adeee878c12..233092f15310 100755 --- a/addons/upgrade/to-12.1-move-rolebyname-to-vpnbyname-fortigate.pl +++ b/addons/upgrade/to-12.1-move-rolebyname-to-vpnbyname-fortigate.pl @@ -54,7 +54,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-3.0-networks.conf.pl b/addons/upgrade/to-3.0-networks.conf.pl index bc3460df0696..71295c30050c 100755 --- a/addons/upgrade/to-3.0-networks.conf.pl +++ b/addons/upgrade/to-3.0-networks.conf.pl @@ -56,7 +56,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-3.0-pf.conf.pl b/addons/upgrade/to-3.0-pf.conf.pl index 5d23d32f3ef0..c6ff18cc4f7b 100755 --- a/addons/upgrade/to-3.0-pf.conf.pl +++ b/addons/upgrade/to-3.0-pf.conf.pl @@ -60,7 +60,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-3.0-violations.conf.pl b/addons/upgrade/to-3.0-violations.conf.pl index 005fa30f2ce6..7883898985ba 100755 --- a/addons/upgrade/to-3.0-violations.conf.pl +++ b/addons/upgrade/to-3.0-violations.conf.pl @@ -35,7 +35,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-3.5-pf.conf.pl b/addons/upgrade/to-3.5-pf.conf.pl index dc13f4a9fe97..4d0c7fb7f7c8 100755 --- a/addons/upgrade/to-3.5-pf.conf.pl +++ b/addons/upgrade/to-3.5-pf.conf.pl @@ -53,7 +53,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-6.3-os-rewrite.pl b/addons/upgrade/to-6.3-os-rewrite.pl index abc8482f27fd..5a66d9ef5652 100755 --- a/addons/upgrade/to-6.3-os-rewrite.pl +++ b/addons/upgrade/to-6.3-os-rewrite.pl @@ -112,7 +112,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.0-pf-conf-changes.pl b/addons/upgrade/to-7.0-pf-conf-changes.pl index 1a048b65a725..dfa5dc1bceb8 100755 --- a/addons/upgrade/to-7.0-pf-conf-changes.pl +++ b/addons/upgrade/to-7.0-pf-conf-changes.pl @@ -106,7 +106,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.0-pf.conf-to-pfmon.conf.pl b/addons/upgrade/to-7.0-pf.conf-to-pfmon.conf.pl index 324a5c1225b9..1d3e59907dfd 100755 --- a/addons/upgrade/to-7.0-pf.conf-to-pfmon.conf.pl +++ b/addons/upgrade/to-7.0-pf.conf-to-pfmon.conf.pl @@ -96,7 +96,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.0-pfdetect-conf.pl b/addons/upgrade/to-7.0-pfdetect-conf.pl index cf32370f6e6f..ca08118a15ab 100755 --- a/addons/upgrade/to-7.0-pfdetect-conf.pl +++ b/addons/upgrade/to-7.0-pfdetect-conf.pl @@ -41,7 +41,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.0-roles-conf.pl b/addons/upgrade/to-7.0-roles-conf.pl index f16239c0bc13..42bff1dbf198 100755 --- a/addons/upgrade/to-7.0-roles-conf.pl +++ b/addons/upgrade/to-7.0-roles-conf.pl @@ -40,7 +40,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.1-authentication-conf.pl b/addons/upgrade/to-7.1-authentication-conf.pl index a5f298bb34ca..c23af69f2f47 100755 --- a/addons/upgrade/to-7.1-authentication-conf.pl +++ b/addons/upgrade/to-7.1-authentication-conf.pl @@ -75,7 +75,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.3-adminroles-conf.pl b/addons/upgrade/to-7.3-adminroles-conf.pl index 1619d0e9aa1a..49fe3917820e 100755 --- a/addons/upgrade/to-7.3-adminroles-conf.pl +++ b/addons/upgrade/to-7.3-adminroles-conf.pl @@ -46,7 +46,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-7.3-authentication-conf.pl b/addons/upgrade/to-7.3-authentication-conf.pl index 6320b82edb07..4c861a763daf 100755 --- a/addons/upgrade/to-7.3-authentication-conf.pl +++ b/addons/upgrade/to-7.3-authentication-conf.pl @@ -70,7 +70,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.0-authentication-conf.pl b/addons/upgrade/to-8.0-authentication-conf.pl index e41f75ed0224..9cfe5fe24aa2 100755 --- a/addons/upgrade/to-8.0-authentication-conf.pl +++ b/addons/upgrade/to-8.0-authentication-conf.pl @@ -158,7 +158,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.0-fingerbank-db-data.pl b/addons/upgrade/to-8.0-fingerbank-db-data.pl index a149ff42ba3c..78e53e62e7dd 100755 --- a/addons/upgrade/to-8.0-fingerbank-db-data.pl +++ b/addons/upgrade/to-8.0-fingerbank-db-data.pl @@ -51,7 +51,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.2-pfdetect-conf.pl b/addons/upgrade/to-8.2-pfdetect-conf.pl index 6be8c93342bf..bdb62702308c 100755 --- a/addons/upgrade/to-8.2-pfdetect-conf.pl +++ b/addons/upgrade/to-8.2-pfdetect-conf.pl @@ -55,7 +55,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.2-pfmon-conf.pl b/addons/upgrade/to-8.2-pfmon-conf.pl index dea3f7a252bd..e9aa90b51025 100755 --- a/addons/upgrade/to-8.2-pfmon-conf.pl +++ b/addons/upgrade/to-8.2-pfmon-conf.pl @@ -34,7 +34,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.2-realm-conf.pl b/addons/upgrade/to-8.2-realm-conf.pl index 7cb8d3cb61bb..98b917f0e264 100755 --- a/addons/upgrade/to-8.2-realm-conf.pl +++ b/addons/upgrade/to-8.2-realm-conf.pl @@ -34,7 +34,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.3-authentication-searchattributes.pl b/addons/upgrade/to-8.3-authentication-searchattributes.pl index 1328f19e1823..8464805627f9 100755 --- a/addons/upgrade/to-8.3-authentication-searchattributes.pl +++ b/addons/upgrade/to-8.3-authentication-searchattributes.pl @@ -45,7 +45,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.3-rename-pf-conf-parameters.pl b/addons/upgrade/to-8.3-rename-pf-conf-parameters.pl index 61277a2fabe6..911c1b0ae427 100755 --- a/addons/upgrade/to-8.3-rename-pf-conf-parameters.pl +++ b/addons/upgrade/to-8.3-rename-pf-conf-parameters.pl @@ -54,7 +54,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-8.3-rm-opswat-metadefender.pl b/addons/upgrade/to-8.3-rm-opswat-metadefender.pl index b727a6ad823c..9cd7b75e6337 100755 --- a/addons/upgrade/to-8.3-rm-opswat-metadefender.pl +++ b/addons/upgrade/to-8.3-rm-opswat-metadefender.pl @@ -44,7 +44,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-9.1-add-domain-conf.pl b/addons/upgrade/to-9.1-add-domain-conf.pl index af7e7fd07eea..2ce82a3c8630 100755 --- a/addons/upgrade/to-9.1-add-domain-conf.pl +++ b/addons/upgrade/to-9.1-add-domain-conf.pl @@ -29,7 +29,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-9.1-move-vlan-pool-technique-parameter.pl b/addons/upgrade/to-9.1-move-vlan-pool-technique-parameter.pl index 59aec7c1b5ea..d697c6eb2755 100755 --- a/addons/upgrade/to-9.1-move-vlan-pool-technique-parameter.pl +++ b/addons/upgrade/to-9.1-move-vlan-pool-technique-parameter.pl @@ -47,7 +47,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-9.1-security-events-remove-useragent.pl b/addons/upgrade/to-9.1-security-events-remove-useragent.pl index a9b2ee747d40..68dfb398e12a 100755 --- a/addons/upgrade/to-9.1-security-events-remove-useragent.pl +++ b/addons/upgrade/to-9.1-security-events-remove-useragent.pl @@ -56,7 +56,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-9.1-selfservice-conf.pl b/addons/upgrade/to-9.1-selfservice-conf.pl index 3f0e7158f59c..edda5bdadcbe 100755 --- a/addons/upgrade/to-9.1-selfservice-conf.pl +++ b/addons/upgrade/to-9.1-selfservice-conf.pl @@ -90,7 +90,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/upgrade/to-9.1-update-potd.pl b/addons/upgrade/to-9.1-update-potd.pl index 6425e4282e06..53258d757ab9 100755 --- a/addons/upgrade/to-9.1-update-potd.pl +++ b/addons/upgrade/to-9.1-update-potd.pl @@ -64,7 +64,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/addons/vagrant/inventory/hosts b/addons/vagrant/inventory/hosts index 15f7789e7dbd..1d73889bed76 100644 --- a/addons/vagrant/inventory/hosts +++ b/addons/vagrant/inventory/hosts @@ -18,7 +18,7 @@ all: hosts: node01: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['node01']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['node01']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -26,7 +26,7 @@ all: ansible_python_interpreter: '/usr/bin/python3' node02: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['node02']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['node02']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -34,7 +34,7 @@ all: ansible_python_interpreter: '/usr/bin/python3' node03: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['node03']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['node03']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -56,7 +56,7 @@ all: hosts: wireless01: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['wireless01']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['wireless01']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -72,7 +72,7 @@ all: hosts: linux01: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['linux01']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['linux01']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -81,7 +81,7 @@ all: memory: 512 linux02: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['linux02']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['linux02']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -138,7 +138,7 @@ all: memory: 16384 pf1deb11dev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pf1deb11dev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pf1deb11dev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -147,7 +147,7 @@ all: memory: 16384 pf2deb11dev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pf2deb11dev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pf2deb11dev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -156,7 +156,7 @@ all: memory: 16384 pf3deb11dev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pf3deb11dev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pf3deb11dev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -192,7 +192,7 @@ all: memory: 16384 pf1deb11localdev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pf1deb11localdev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pf1deb11localdev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -201,7 +201,7 @@ all: memory: 16384 pf2deb11localdev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pf2deb11localdev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pf2deb11localdev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -210,7 +210,7 @@ all: memory: 16384 pf3deb11localdev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pf3deb11localdev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pf3deb11localdev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -231,7 +231,7 @@ all: memory: 16384 pfdeb11dev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pfdeb11dev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pfdeb11dev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -249,7 +249,7 @@ all: memory: 16384 deb11dev: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['deb11dev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['deb11dev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -271,7 +271,7 @@ all: memory: 16384 pfdeb11localdev: box: inverse-inc/pfdeb11dev - box_version: 12.2.20221123131801 + box_version: 12.2.20221230132951 mgmt_ip: "{{ users_vars[dict_name]['vms']['pfdeb11localdev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pfdeb11localdev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -289,7 +289,7 @@ all: memory: 16384 deb11localdev: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['deb11dev']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['deb11dev']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" @@ -316,7 +316,7 @@ all: memory: 16384 pfdeb11stable: box: debian/bullseye64 - box_version: 11.20220912.1 + box_version: 11.20221219.1 mgmt_ip: "{{ users_vars[dict_name]['vms']['pfdeb11stable']['ip'] }}" mgmt_netmask: "{{ users_vars[dict_name]['vms']['pfdeb11stable']['netmask'] }}" ansible_host: "{{ mgmt_ip }}" diff --git a/addons/watchdog/freeradius-watchdog.sh b/addons/watchdog/freeradius-watchdog.sh index b31dac32f8d3..aec7c6c2a63f 100755 --- a/addons/watchdog/freeradius-watchdog.sh +++ b/addons/watchdog/freeradius-watchdog.sh @@ -7,7 +7,7 @@ # # TODO this test should be migrated into `bin/pfcmd service ... watch` # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Author: Inverse inc. # diff --git a/addons/watchdog/pfdhcpdlistener-watchdog.sh b/addons/watchdog/pfdhcpdlistener-watchdog.sh index 68c2db113903..af77242163cf 100755 --- a/addons/watchdog/pfdhcpdlistener-watchdog.sh +++ b/addons/watchdog/pfdhcpdlistener-watchdog.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # # Author: Inverse inc. # diff --git a/bin/cluster/management_update b/bin/cluster/management_update index 5ce3b0985bee..bfcb6774b6e1 100755 --- a/bin/cluster/management_update +++ b/bin/cluster/management_update @@ -67,7 +67,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/bin/cluster/node b/bin/cluster/node index 5e06240c3314..09f84d3e8395 100755 --- a/bin/cluster/node +++ b/bin/cluster/node @@ -107,7 +107,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/bin/cluster/sync b/bin/cluster/sync index 855346189816..ce1a7c64d0c7 100755 --- a/bin/cluster/sync +++ b/bin/cluster/sync @@ -164,7 +164,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/bin/pfcmd.pl b/bin/pfcmd.pl index 5cd5a313a841..3c91e82cb3d5 100755 --- a/bin/pfcmd.pl +++ b/bin/pfcmd.pl @@ -35,7 +35,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/bin/pfcmd_vlan b/bin/pfcmd_vlan index 56aebbeff2fb..65a54cd00ebd 100755 --- a/bin/pfcmd_vlan +++ b/bin/pfcmd_vlan @@ -708,7 +708,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/bin/pflogger.pl b/bin/pflogger.pl index 5242e4d588bc..86f2c392b10c 100755 --- a/bin/pflogger.pl +++ b/bin/pflogger.pl @@ -41,7 +41,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/bin/pftest b/bin/pftest index 38450d0c4158..b5cf46efc1db 100755 --- a/bin/pftest +++ b/bin/pftest @@ -26,7 +26,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/ci/debian-installer/create-debian-installer.sh b/ci/debian-installer/create-debian-installer.sh index 71daf1f2024f..1c85ed3d97f4 100755 --- a/ci/debian-installer/create-debian-installer.sh +++ b/ci/debian-installer/create-debian-installer.sh @@ -8,7 +8,7 @@ function clean() { chmod a+rw $ISO_OUT } -ISO_IN=${ISO_IN:-debian-11.5.0-amd64-netinst.iso} +ISO_IN=${ISO_IN:-debian-11.6.0-amd64-netinst.iso} ISO_OUT=${ISO_OUT:-packetfence-debian-installer.iso} if ! [ -f $ISO_IN ]; then diff --git a/ci/lib/common/functions.sh b/ci/lib/common/functions.sh index 42641f0d90f8..f2cc1b034c65 100644 --- a/ci/lib/common/functions.sh +++ b/ci/lib/common/functions.sh @@ -23,9 +23,15 @@ log_subsection() { } get_pf_release() { - PF_RELEASE_PATH=$(readlink -e ${PF_SRC_DIR}/conf/pf-release) - PF_MINOR_RELEASE=$(perl -ne 'print $1 if (m/.*?(\d+\.\d+)./)' ${PF_RELEASE_PATH}) - PF_PATCH_RELEASE=$(perl -ne 'print $1 if (m/.*?(\d+\.\d+\.\d+)/)' ${PF_RELEASE_PATH}) + if [ -f "${PF_SRC_DIR}/conf/pf-release" ]; then + PF_RELEASE_PATH=$(readlink -e ${PF_SRC_DIR}/conf/pf-release) + PF_MINOR_RELEASE=$(perl -ne 'print $1 if (m/.*?(\d+\.\d+)./)' ${PF_RELEASE_PATH}) + PF_PATCH_RELEASE=$(perl -ne 'print $1 if (m/.*?(\d+\.\d+\.\d+)/)' ${PF_RELEASE_PATH}) + else + echo "We are not in a PacketFence tree, reading variables from environment" + PF_MINOR_RELEASE=${PF_MINOR_RELEASE:-99.9} + PF_PATCH_RELEASE=${PF_PATCH_RELEASE:-99.9.9} + fi } # https://newbedev.com/how-to-urlencode-data-for-curl-command diff --git a/ci/lib/upload/deploy-artifacts.sh b/ci/lib/upload/deploy-artifacts.sh index 7de21223d43a..8899bbbb2135 100755 --- a/ci/lib/upload/deploy-artifacts.sh +++ b/ci/lib/upload/deploy-artifacts.sh @@ -21,6 +21,9 @@ DEPLOY_HOST=${DEPLOY_HOST:-web.inverse.ca} PUBLIC_REPO_BASE_DIR=${PUBLIC_REPO_BASE_DIR:-/var/www/inverse.ca/downloads/PacketFence} +# CI +CI_PLATFORM=${CI_PLATFORM:-gitlab} + # RPM DEPLOY_SRPMS=${DEPLOY_SRPMS:-no} RPM_BASE_DIR=${RPM_BASE_DIR:-"${PUBLIC_REPO_BASE_DIR}"} @@ -34,7 +37,7 @@ DEB_DEPLOY_DIR=${DEB_DEPLOY_DIR:-foo} DEB_RESULT_DIR=${DEB_RESULT_DIR:-"${RESULT_DIR}/debian"} # Maintenance -GITLAB_DEPLOY_DIR=${GITLAB_DEPLOY_DIR:-tmp} +PPA_ID=${PPA_ID:-tmp} # CI # automatically set up by CI based on environment @@ -168,7 +171,7 @@ packetfence_ci_lib_deploy() { ppa_deploy() { # warning: slashs at end of dirs are significant for rsync src_dir="$PUBLIC_DIR/" - dst_repo="$PUBLIC_REPO_BASE_DIR/gitlab/$GITLAB_DEPLOY_DIR/" + dst_repo="$PUBLIC_REPO_BASE_DIR/$CI_PLATFORM/$PPA_ID/" dst_dir="$DEPLOY_USER@$DEPLOY_HOST:$dst_repo" declare -p src_dir dst_dir echo "rsync: $src_dir -> $dst_dir" diff --git a/ci/packer/vagrant_img/sources.pkr.hcl b/ci/packer/vagrant_img/sources.pkr.hcl index fa4f73e34782..8b4d466a94e0 100644 --- a/ci/packer/vagrant_img/sources.pkr.hcl +++ b/ci/packer/vagrant_img/sources.pkr.hcl @@ -12,7 +12,7 @@ source "vagrant" "el-8" { source "vagrant" "debian-11" { communicator = "ssh" source_path = "debian/bullseye64" - box_version = "11.20220328.1" + box_version = "11.20221219.1" provider = "libvirt" output_dir = "${var.output_dir}" template = "templates/vagrantfile_template" diff --git a/ci/packer/zen/sources.pkr.hcl b/ci/packer/zen/sources.pkr.hcl index aeb8a1ababbc..f0b6f894828a 100644 --- a/ci/packer/zen/sources.pkr.hcl +++ b/ci/packer/zen/sources.pkr.hcl @@ -17,8 +17,8 @@ source "virtualbox-iso" "debian-11" { ["modifyvm", "{{.Name}}", "--uartmode1", "disconnected"], ["storagectl", "{{.Name}}", "--name", "IDE Controller", "--remove"] ] - iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-11.5.0-amd64-netinst.iso" - iso_checksum = "sha256:e307d0e583b4a8f7e5b436f8413d4707dd4242b70aea61eb08591dc0378522f3" + iso_url = "https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-11.6.0-amd64-netinst.iso" + iso_checksum = "sha256:e482910626b30f9a7de9b0cc142c3d4a079fbfa96110083be1d0b473671ce08d" # boot parameters to preseed questions # all parameters below can't be moved to preseed file boot_command = [ diff --git a/conf/documentation.conf b/conf/documentation.conf index 18346b9b38e3..63e6e5148341 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -1230,6 +1230,13 @@ Other domain names under which the captive portal responds. Requires to restart haproxy-portal to be fully effective. EOT +[captive_portal.expose_fingerbank_info_all_templates] +type=toggle +options=enabled|disabled +description=<= 1.4.1), fingerbank-collector (<< 2.0.0), packetfence-redis-cache (>= ${source:Version}), packetfence-perl (>= 1.2.1), - netdata (= 1:1.10.0-1), - libmariadbd-dev (>= 10.1) + netdata (= 1:1.10.0-1) +# Removed for now +# libmariadbd-dev (>= 10.1), libmariadbd-dev (<< 10.5.18) Breaks: libdata-alias-perl Depends: ${misc:Depends}, vlan, packetfence-ntlm-wrapper (>= ${source:Version}), packetfence-golang-daemon (>= ${source:Version}), diff --git a/debian/copyright b/debian/copyright index 648a0db61cd4..f77bb15f9a0d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,7 +18,7 @@ Upstream Author(s): Copyright: - Copyright (C) 2005-2022 Inverse inc. + Copyright (C) 2005-2023 Inverse inc. License: @@ -42,7 +42,7 @@ see "/usr/share/common-licenses/GPL-2". The Debian packaging is: - Copyright (C) 2005-2022 Inverse inc. + Copyright (C) 2005-2023 Inverse inc. and is licensed under the GPL version 2 or later, see "/usr/share/common-licenses/GPL-2". diff --git a/debian/rules b/debian/rules index 434c4c98a8ee..f9c59a1d470a 100755 --- a/debian/rules +++ b/debian/rules @@ -264,6 +264,7 @@ binary-arch: build install /usr/local/pf/raddb/mods-config/preprocess/huntgroups /usr/local/pf/raddb/huntgroups \ /usr/local/fingerbank/lib/fingerbank /usr/local/pf/lib/fingerbank \ /usr/local/pf/html/pfappserver/lib/pfappserver /usr/local/pf/lib/pfappserver \ + /usr/local/pf/html/captive-portal/lib/captiveportal /usr/local/pf/lib/captiveportal \ /usr/local/pf/addons/upgrade/move-logos-to-profile-templates.pl /usr/local/pf/addons/upgrade/to-12.1-move-logos-to-profile-templates.pl dh_strip dh_compress diff --git a/docs/api/spec/generate-openapi-from-routes.pl b/docs/api/spec/generate-openapi-from-routes.pl index 2d3f29527cd0..fd66c8db2d8c 100755 --- a/docs/api/spec/generate-openapi-from-routes.pl +++ b/docs/api/spec/generate-openapi-from-routes.pl @@ -253,7 +253,7 @@ =head1 AUTHOR =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/docs/common/upgrade_packages.asciidoc b/docs/common/upgrade_packages.asciidoc index 751f0b9414b2..b0cb70941e87 100644 --- a/docs/common/upgrade_packages.asciidoc +++ b/docs/common/upgrade_packages.asciidoc @@ -1,17 +1,32 @@ In order to upgrade your PacketFence packages to latest version, you can run following commands: -.RHEL-based systems +==== RHEL-based systems + [source,bash] ---- yum clean all --enablerepo=packetfence yum update --enablerepo=packetfence ---- -.Debian-based systems +==== Debian-based systems + +If `libmariadb-dev` is installed on your system at a version prior to 10.5.18, you will need to run following commands: + [source,bash] ---- apt update +apt install packetfence +apt autoremove apt upgrade ---- +In all other cases, you can simply run: + +[source,bash] +---- +apt update +apt upgrade +---- +NOTE: In order to get `libmariadb-dev` package version, you can run following command: `dpkg -l | grep libmariadb-dev`. +If previous command doesn't return anything, `libmariadb-dev` is not installed. diff --git a/docs/includes/additional-info.asciidoc b/docs/includes/additional-info.asciidoc index cc09c208a4b1..246e350f9cde 100644 --- a/docs/includes/additional-info.asciidoc +++ b/docs/includes/additional-info.asciidoc @@ -6,7 +6,7 @@ Authors: - Inverse inc. - Copyright (C) 2005-2022 Inverse inc. + Copyright (C) 2005-2023 Inverse inc. License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html //// diff --git a/docs/includes/commercial-support.asciidoc b/docs/includes/commercial-support.asciidoc index 2d90f27022cd..683fa7278787 100644 --- a/docs/includes/commercial-support.asciidoc +++ b/docs/includes/commercial-support.asciidoc @@ -6,7 +6,7 @@ Authors: - Inverse inc. - Copyright (C) 2005-2022 Inverse inc. + Copyright (C) 2005-2023 Inverse inc. License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html //// diff --git a/docs/includes/global-attributes.asciidoc b/docs/includes/global-attributes.asciidoc index eff6d8b128f5..ccdde83b9f58 100644 --- a/docs/includes/global-attributes.asciidoc +++ b/docs/includes/global-attributes.asciidoc @@ -6,7 +6,7 @@ Authors: - Inverse inc. - Copyright (C) 2005-2022 Inverse inc. + Copyright (C) 2005-2023 Inverse inc. License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html //// diff --git a/docs/includes/license.asciidoc b/docs/includes/license.asciidoc index 2f9c5033f5b7..a4dba2dbceb9 100644 --- a/docs/includes/license.asciidoc +++ b/docs/includes/license.asciidoc @@ -6,7 +6,7 @@ Authors: - Inverse inc. - Copyright (C) 2005-2022 Inverse inc. + Copyright (C) 2005-2023 Inverse inc. License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html //// diff --git a/docs/network/wireless_controllers_and_access_point_configuration.asciidoc b/docs/network/wireless_controllers_and_access_point_configuration.asciidoc index 2e261170528f..d75ded231e63 100644 --- a/docs/network/wireless_controllers_and_access_point_configuration.asciidoc +++ b/docs/network/wireless_controllers_and_access_point_configuration.asciidoc @@ -100,11 +100,11 @@ include::networkdevice/aruba.asciidoc[] === Belair Networks (now Ericsson) -include::networkdevice/belair_networks_ericsson.asciidoc +include::networkdevice/belair_networks_ericsson.asciidoc[] === Bluesocket -include::networkdevice/bluesocket.asciidoc +include::networkdevice/bluesocket.asciidoc[] === Brocade diff --git a/go/caddy/pfpki/models/models.go b/go/caddy/pfpki/models/models.go index 7adba534792b..e906d047d019 100644 --- a/go/caddy/pfpki/models/models.go +++ b/go/caddy/pfpki/models/models.go @@ -632,7 +632,8 @@ func revokeNeeded(cn string, profile string, allowTime int, c *gorm.DB) (bool, e return true, nil } } - return false, errors.New("Certificate with this Subject already exist") + + return false, errors.New("Certificate with this Subject already exist: " + cn) } diff --git a/go/caddy/pfpki/scep/scep.go b/go/caddy/pfpki/scep/scep.go index c46d29a6d741..7eb3915b63e1 100644 --- a/go/caddy/pfpki/scep/scep.go +++ b/go/caddy/pfpki/scep/scep.go @@ -4,8 +4,8 @@ import ( "net/http" "os" - kitlog "github.com/go-kit/kit/log" - kitloglevel "github.com/go-kit/kit/log/level" + kitlog "github.com/go-kit/log" + kitloglevel "github.com/go-kit/log/level" "github.com/gorilla/mux" "github.com/inverse-inc/go-utils/log" "github.com/inverse-inc/packetfence/go/caddy/pfpki/cloud" diff --git a/go/chisel/server/server_handler.go b/go/chisel/server/server_handler.go index df340948a285..d1a157250add 100644 --- a/go/chisel/server/server_handler.go +++ b/go/chisel/server/server_handler.go @@ -272,12 +272,15 @@ func (s *Server) handleDynReverse(w http.ResponseWriter, req *http.Request) { remote.Dynamic = true remote.LastTouched = time.Now() + settings.ActiveDynReverse.Store(cacheKey, remote) go func() { - // TODO: handle an error - tun.BindRemotes(context.Background(), []*settings.Remote{remote}) + ctx := context.Background() + if err := tun.BindRemotes(ctx, []*settings.Remote{remote}); err != nil { + log.LoggerWContext(ctx).Error(fmt.Sprintf("Error binding remote %s: %s", remote, err)) + settings.ActiveDynReverse.Delete(cacheKey) + } }() - settings.ActiveDynReverse.Store(cacheKey, remote) json.NewEncoder(w).Encode(gin.H{"host": host, "port": dynPort, "message": fmt.Sprintf("Setup remote %s", remoteStr)}) } else { w.WriteHeader(http.StatusNotFound) diff --git a/go/chisel/share/tunnel/tunnel_in_proxy_udp.go b/go/chisel/share/tunnel/tunnel_in_proxy_udp.go index cf88f24d046f..b67dcf7fd9b8 100644 --- a/go/chisel/share/tunnel/tunnel_in_proxy_udp.go +++ b/go/chisel/share/tunnel/tunnel_in_proxy_udp.go @@ -95,6 +95,10 @@ func (u *udpListener) runInbound(ctx context.Context) error { if e, ok := err.(net.Error); ok && (e.Timeout() || e.Temporary()) { continue } + if ctx.Err() != nil { + u.Debugf("Reading on a canceled remote") + return nil + } if err != nil { return u.Errorf("read error: %w", err) } @@ -224,11 +228,11 @@ func (u *udpListener) monitorInactivity(ctx context.Context, cancel func()) erro u.Infof("Closing due to inactivity timeout") + cancel() u.inbound.Close() if u.outbound != nil && u.outbound.c != nil { u.outbound.c.Close() } - cancel() return nil } } diff --git a/go/cmd/pfacct/radius.go b/go/cmd/pfacct/radius.go index cee18a8604c0..cef8441be57e 100644 --- a/go/cmd/pfacct/radius.go +++ b/go/cmd/pfacct/radius.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "encoding/binary" + "errors" "fmt" "hash" "net" @@ -123,6 +124,11 @@ func (h *PfAcct) handleAccountingRequest(rr radiusRequest) { out_bytes += giga_out_bytes << 32 in_bytes += giga_in_bytes << 32 unique_session_id := h.accountingUniqueSessionId(r) + err := h.updateNodeOnlineOfflineOnline(status, mac, unique_session_id) + if err != nil { + logError(ctx, fmt.Sprintf("Error updating online offline status: %s", err.Error())) + } + timestamp, err := rfc2869.EventTimestamp_Lookup(r.Packet) if err != nil { timestamp = time.Now() @@ -562,6 +568,8 @@ type RadiusStatements struct { isNodeBandwidthBalanceZero *sql.Stmt isUnreg *sql.Stmt closeSession *sql.Stmt + nodeOnlineOffLineStartUpdate *sql.Stmt + nodeOnlineOffLineStop *sql.Stmt } func setupStmt(db *sql.DB, stmt **sql.Stmt, sql string) { @@ -685,6 +693,41 @@ func (rs *RadiusStatements) Setup(db *sql.DB) { UPDATE bandwidth_accounting SET last_updated = '0000-00-00 00:00:00' WHERE node_id = ? AND unique_session_id = ?; `) + setupStmt(db, &rs.nodeOnlineOffLineStop, ` + UPDATE node_current_session SET is_online = 0 WHERE mac = ? AND last_session_id = ?; + `) + + setupStmt(db, &rs.nodeOnlineOffLineStartUpdate, ` + INSERT INTO node_current_session (mac, last_session_id, updated, is_online) VALUES (?, ?, NOW(), 1) + ON DUPLICATE KEY UPDATE updated = VALUES(updated), last_session_id = VALUES(last_session_id); + `) + +} + +func (rs *RadiusStatements) updateNodeOnlineOfflineOnline(status rfc2866.AcctStatusType, mac mac.Mac, session_id uint64) error { + var err error = nil + switch status { + default: + err = errors.New("Invalid status") + case rfc2866.AcctStatusType_Value_Start, rfc2866.AcctStatusType_Value_InterimUpdate: + _, err = tryExecute( + 3, + 10*time.Millisecond, + rs.nodeOnlineOffLineStartUpdate, + mac.String(), + session_id, + ) + case rfc2866.AcctStatusType_Value_Stop: + _, err = tryExecute( + 3, + 10*time.Millisecond, + rs.nodeOnlineOffLineStop, + mac.String(), + session_id, + ) + } + + return err } func (rs *RadiusStatements) IsUnreg(mac string) (bool, error) { diff --git a/go/coredns/core/plugin/zplugin.go b/go/coredns/core/plugin/zplugin.go index 38607009dbe9..80585120498d 100644 --- a/go/coredns/core/plugin/zplugin.go +++ b/go/coredns/core/plugin/zplugin.go @@ -28,7 +28,6 @@ import ( _ "github.com/inverse-inc/packetfence/go/coredns/plugin/health" _ "github.com/inverse-inc/packetfence/go/coredns/plugin/hosts" _ "github.com/inverse-inc/packetfence/go/coredns/plugin/k8s_external" - _ "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes" _ "github.com/inverse-inc/packetfence/go/coredns/plugin/loadbalance" _ "github.com/inverse-inc/packetfence/go/coredns/plugin/log" _ "github.com/inverse-inc/packetfence/go/coredns/plugin/logger" diff --git a/go/coredns/plugin/kubernetes/README.md b/go/coredns/plugin/kubernetes/README.md deleted file mode 100644 index 007e4bd72715..000000000000 --- a/go/coredns/plugin/kubernetes/README.md +++ /dev/null @@ -1,241 +0,0 @@ -# kubernetes - -## Name - -*kubernetes* - enables reading zone data from a Kubernetes cluster. - -## Description - -This plugin implements the [Kubernetes DNS-Based Service Discovery -Specification](https://github.com/kubernetes/dns/blob/master/docs/specification.md). - -CoreDNS running the kubernetes plugin can be used as a replacement for kube-dns in a kubernetes -cluster. See the [deployment](https://github.com/coredns/deployment) repository for details on [how -to deploy CoreDNS in Kubernetes](https://github.com/coredns/deployment/tree/master/kubernetes). - -[stubDomains and upstreamNameservers](https://kubernetes.io/blog/2017/04/configuring-private-dns-zones-upstream-nameservers-kubernetes/) -are implemented via the *forward* plugin. See the examples below. - -This plugin can only be used once per Server Block. - -## Syntax - -~~~ -kubernetes [ZONES...] -~~~ - -With only the plugin specified, the *kubernetes* plugin will default to the zone specified in -the server's block. It will handle all queries in that zone and connect to Kubernetes in-cluster. It -will not provide PTR records for services or A records for pods. If **ZONES** is used it specifies -all the zones the plugin should be authoritative for. - -``` -kubernetes [ZONES...] { - endpoint URL - tls CERT KEY CACERT - kubeconfig KUBECONFIG CONTEXT - namespaces NAMESPACE... - labels EXPRESSION - pods POD-MODE - endpoint_pod_names - ttl TTL - noendpoints - fallthrough [ZONES...] - ignore empty_service -} -``` - -* `endpoint` specifies the **URL** for a remote k8s API endpoint. - If omitted, it will connect to k8s in-cluster using the cluster service account. -* `tls` **CERT** **KEY** **CACERT** are the TLS cert, key and the CA cert file names for remote k8s connection. - This option is ignored if connecting in-cluster (i.e. endpoint is not specified). -* `kubeconfig` **KUBECONFIG** **CONTEXT** authenticates the connection to a remote k8s cluster using a kubeconfig file. It supports TLS, username and password, or token-based authentication. This option is ignored if connecting in-cluster (i.e., the endpoint is not specified). -* `namespaces` **NAMESPACE [NAMESPACE...]** only exposes the k8s namespaces listed. - If this option is omitted all namespaces are exposed -* `namespace_labels` **EXPRESSION** only expose the records for Kubernetes namespaces that match this label selector. - The label selector syntax is described in the - [Kubernetes User Guide - Labels](https://kubernetes.io/docs/user-guide/labels/). An example that - only exposes namespaces labeled as "istio-injection=enabled", would use: - `labels istio-injection=enabled`. -* `labels` **EXPRESSION** only exposes the records for Kubernetes objects that match this label selector. - The label selector syntax is described in the - [Kubernetes User Guide - Labels](https://kubernetes.io/docs/user-guide/labels/). An example that - only exposes objects labeled as "application=nginx" in the "staging" or "qa" environments, would - use: `labels environment in (staging, qa),application=nginx`. -* `pods` **POD-MODE** sets the mode for handling IP-based pod A records, e.g. - `1-2-3-4.ns.pod.cluster.local. in A 1.2.3.4`. - This option is provided to facilitate use of SSL certs when connecting directly to pods. Valid - values for **POD-MODE**: - - * `disabled`: Default. Do not process pod requests, always returning `NXDOMAIN` - * `insecure`: Always return an A record with IP from request (without checking k8s). This option - is vulnerable to abuse if used maliciously in conjunction with wildcard SSL certs. This - option is provided for backward compatibility with kube-dns. - * `verified`: Return an A record if there exists a pod in same namespace with matching IP. This - option requires substantially more memory than in insecure mode, since it will maintain a watch - on all pods. - -* `endpoint_pod_names` uses the pod name of the pod targeted by the endpoint as - the endpoint name in A records, e.g., - `endpoint-name.my-service.namespace.svc.cluster.local. in A 1.2.3.4` - By default, the endpoint-name name selection is as follows: Use the hostname - of the endpoint, or if hostname is not set, use the dashed form of the endpoint - IP address (e.g., `1-2-3-4.my-service.namespace.svc.cluster.local.`) - If this directive is included, then name selection for endpoints changes as - follows: Use the hostname of the endpoint, or if hostname is not set, use the - pod name of the pod targeted by the endpoint. If there is no pod targeted by - the endpoint, use the dashed IP address form. -* `ttl` allows you to set a custom TTL for responses. The default is 5 seconds. The minimum TTL allowed is - 0 seconds, and the maximum is capped at 3600 seconds. Setting TTL to 0 will prevent records from being cached. -* `noendpoints` will turn off the serving of endpoint records by disabling the watch on endpoints. - All endpoint queries and headless service queries will result in an NXDOMAIN. -* `fallthrough` **[ZONES...]** If a query for a record in the zones for which the plugin is authoritative - results in NXDOMAIN, normally that is what the response will be. However, if you specify this option, - the query will instead be passed on down the plugin chain, which can include another plugin to handle - the query. If **[ZONES...]** is omitted, then fallthrough happens for all zones for which the plugin - is authoritative. If specific zones are listed (for example `in-addr.arpa` and `ip6.arpa`), then only - queries for those zones will be subject to fallthrough. -* `ignore empty_service` returns NXDOMAIN for services without any ready endpoint addresses (e.g., ready pods). - This allows the querying pod to continue searching for the service in the search path. - The search path could, for example, include another Kubernetes cluster. - -Enabling zone transfer is done by using the *transfer* plugin. - -## Ready - -This plugin reports readiness to the ready plugin. This will happen after it has synced to the -Kubernetes API. - -## Examples - -Handle all queries in the `cluster.local` zone. Connect to Kubernetes in-cluster. Also handle all -`in-addr.arpa` `PTR` requests for `10.0.0.0/17` . Verify the existence of pods when answering pod -requests. - -~~~ txt -10.0.0.0/17 cluster.local { - kubernetes { - pods verified - } -} -~~~ - -Or you can selectively expose some namespaces: - -~~~ txt -kubernetes cluster.local { - namespaces test staging -} -~~~ - -Connect to Kubernetes with CoreDNS running outside the cluster: - -~~~ txt -kubernetes cluster.local { - endpoint https://k8s-endpoint:8443 - tls cert key cacert -} -~~~ - -## stubDomains and upstreamNameservers - -Here we use the *forward* plugin to implement a stubDomain that forwards `example.local` to the nameserver `10.100.0.10:53`. -Also configured is an upstreamNameserver `8.8.8.8:53` that will be used for resolving names that do not fall in `cluster.local` -or `example.local`. - -~~~ txt -cluster.local:53 { - kubernetes cluster.local -} -example.local { - forward . 10.100.0.10:53 -} - -. { - forward . 8.8.8.8:53 -} -~~~ - -The configuration above represents the following Kube-DNS stubDomains and upstreamNameservers configuration. - -~~~ txt -stubDomains: | - {“example.local”: [“10.100.0.10:53”]} -upstreamNameservers: | - [“8.8.8.8:53”] -~~~ - -## AutoPath - -The *kubernetes* plugin can be used in conjunction with the *autopath* plugin. Using this -feature enables server-side domain search path completion in Kubernetes clusters. Note: `pods` must -be set to `verified` for this to function properly. Furthermore, the remote IP address in the DNS -packet received by CoreDNS must be the IP address of the Pod that sent the request. - - cluster.local { - autopath @kubernetes - kubernetes { - pods verified - } - } - -## Wildcards - -Some query labels accept a wildcard value to match any value. If a label is a valid wildcard (\*, -or the word "any"), then that label will match all values. The labels that accept wildcards are: - - * _endpoint_ in an `A` record request: _endpoint_.service.namespace.svc.zone, e.g., `*.nginx.ns.svc.cluster.local` - * _service_ in an `A` record request: _service_.namespace.svc.zone, e.g., `*.ns.svc.cluster.local` - * _namespace_ in an `A` record request: service._namespace_.svc.zone, e.g., `nginx.*.svc.cluster.local` - * _port and/or protocol_ in an `SRV` request: __port_.__protocol_.service.namespace.svc.zone., - e.g., `_http.*.service.ns.svc.cluster.local` - * multiple wildcards are allowed in a single query, e.g., `A` Request `*.*.svc.zone.` or `SRV` request `*.*.*.*.svc.zone.` - - For example, wildcards can be used to resolve all Endpoints for a Service as `A` records. e.g.: `*.service.ns.svc.myzone.local` will return the Endpoint IPs in the Service `service` in namespace `default`: - -``` -*.service.default.svc.cluster.local. 5 IN A 192.168.10.10 -*.service.default.svc.cluster.local. 5 IN A 192.168.25.15 -``` - -## Metadata - -The kubernetes plugin will publish the following metadata, if the *metadata* -plugin is also enabled: - - * `kubernetes/endpoint`: the endpoint name in the query - * `kubernetes/kind`: the resource kind (pod or svc) in the query - * `kubernetes/namespace`: the namespace in the query - * `kubernetes/port-name`: the port name in an SRV query - * `kubernetes/protocol`: the protocol in an SRV query - * `kubernetes/service`: the service name in the query - * `kubernetes/client-namespace`: the client pod's namespace (see requirements below) - * `kubernetes/client-pod-name`: the client pod's name (see requirements below) - -The `kubernetes/client-namespace` and `kubernetes/client-pod-name` metadata work by reconciling the -client IP address in the DNS request packet to a known pod IP address. Therefore the following is required: - * `pods verified` mode must be enabled - * the remote IP address in the DNS packet received by CoreDNS must be the IP address - of the Pod that sent the request. - -## Metrics - -If monitoring is enabled (via the *prometheus* plugin) then the following metrics are exported: - -* `coredns_kubernetes_dns_programming_duration_seconds{service_kind}` - Exports the - [DNS programming latency SLI](https://github.com/kubernetes/community/blob/master/sig-scalability/slos/dns_programming_latency.md). - The metrics has the `service_kind` label that identifies the kind of the - [kubernetes service](https://kubernetes.io/docs/concepts/services-networking/service). - It may take one of the three values: - * `cluster_ip` - * `headless_with_selector` - * `headless_without_selector` - -## Bugs - -The duration metric only supports the "headless\_with\_selector" service currently. - -## Also See - -See the *autopath* plugin to enable search path optimizations. And use the *transfer* plugin to -enable outgoing zone transfers. diff --git a/go/coredns/plugin/kubernetes/autopath.go b/go/coredns/plugin/kubernetes/autopath.go deleted file mode 100644 index e3f53d6bda9f..000000000000 --- a/go/coredns/plugin/kubernetes/autopath.go +++ /dev/null @@ -1,62 +0,0 @@ -package kubernetes - -import ( - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes/object" - "github.com/inverse-inc/packetfence/go/coredns/request" -) - -// AutoPath implements the AutoPathFunc call from the autopath plugin. -// It returns a per-query search path or nil indicating no searchpathing should happen. -func (k *Kubernetes) AutoPath(state request.Request) []string { - // Check if the query falls in a zone we are actually authoritative for and thus if we want autopath. - zone := plugin.Zones(k.Zones).Matches(state.Name()) - if zone == "" { - return nil - } - - // cluster.local { - // autopath @kubernetes - // kubernetes { - // pods verified # - // } - // } - // if pods != verified will cause panic and return SERVFAIL, expect worked as normal without autopath function - if !k.opts.initPodCache { - return nil - } - - ip := state.IP() - - pod := k.podWithIP(ip) - if pod == nil { - return nil - } - - search := make([]string, 3) - if zone == "." { - search[0] = pod.Namespace + ".svc." - search[1] = "svc." - search[2] = "." - } else { - search[0] = pod.Namespace + ".svc." + zone - search[1] = "svc." + zone - search[2] = zone - } - - search = append(search, k.autoPathSearch...) - search = append(search, "") // sentinel - return search -} - -// podWithIP returns the api.Pod for source IP. It returns nil if nothing can be found. -func (k *Kubernetes) podWithIP(ip string) *object.Pod { - if k.podMode != podModeVerified { - return nil - } - ps := k.APIConn.PodIndex(ip) - if len(ps) == 0 { - return nil - } - return ps[0] -} diff --git a/go/coredns/plugin/kubernetes/controller.go b/go/coredns/plugin/kubernetes/controller.go deleted file mode 100644 index b7fd24753cd8..000000000000 --- a/go/coredns/plugin/kubernetes/controller.go +++ /dev/null @@ -1,523 +0,0 @@ -package kubernetes - -import ( - "context" - "errors" - "fmt" - "sync" - "sync/atomic" - "time" - - "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes/object" - - api "k8s.io/api/core/v1" - meta "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/tools/cache" -) - -const ( - podIPIndex = "PodIP" - svcNameNamespaceIndex = "NameNamespace" - svcIPIndex = "ServiceIP" - epNameNamespaceIndex = "EndpointNameNamespace" - epIPIndex = "EndpointsIP" -) - -type dnsController interface { - ServiceList() []*object.Service - EndpointsList() []*object.Endpoints - SvcIndex(string) []*object.Service - SvcIndexReverse(string) []*object.Service - PodIndex(string) []*object.Pod - EpIndex(string) []*object.Endpoints - EpIndexReverse(string) []*object.Endpoints - - GetNodeByName(context.Context, string) (*api.Node, error) - GetNamespaceByName(string) (*api.Namespace, error) - - Run() - HasSynced() bool - Stop() error - - // Modified returns the timestamp of the most recent changes - Modified() int64 -} - -type dnsControl struct { - // Modified tracks timestamp of the most recent changes - // It needs to be first because it is guaranteed to be 8-byte - // aligned ( we use sync.LoadAtomic with this ) - modified int64 - - client kubernetes.Interface - - selector labels.Selector - namespaceSelector labels.Selector - - svcController cache.Controller - podController cache.Controller - epController cache.Controller - nsController cache.Controller - - svcLister cache.Indexer - podLister cache.Indexer - epLister cache.Indexer - nsLister cache.Store - - // stopLock is used to enforce only a single call to Stop is active. - // Needed because we allow stopping through an http endpoint and - // allowing concurrent stoppers leads to stack traces. - stopLock sync.Mutex - shutdown bool - stopCh chan struct{} - - zones []string - endpointNameMode bool -} - -type dnsControlOpts struct { - initPodCache bool - initEndpointsCache bool - ignoreEmptyService bool - - // Label handling. - labelSelector *meta.LabelSelector - selector labels.Selector - namespaceLabelSelector *meta.LabelSelector - namespaceSelector labels.Selector - - zones []string - endpointNameMode bool - skipAPIObjectsCleanup bool -} - -// newDNSController creates a controller for CoreDNS. -func newdnsController(ctx context.Context, kubeClient kubernetes.Interface, opts dnsControlOpts) *dnsControl { - dns := dnsControl{ - client: kubeClient, - selector: opts.selector, - namespaceSelector: opts.namespaceSelector, - stopCh: make(chan struct{}), - zones: opts.zones, - endpointNameMode: opts.endpointNameMode, - } - - dns.svcLister, dns.svcController = object.NewIndexerInformer( - &cache.ListWatch{ - ListFunc: serviceListFunc(ctx, dns.client, api.NamespaceAll, dns.selector), - WatchFunc: serviceWatchFunc(ctx, dns.client, api.NamespaceAll, dns.selector), - }, - &api.Service{}, - cache.ResourceEventHandlerFuncs{AddFunc: dns.Add, UpdateFunc: dns.Update, DeleteFunc: dns.Delete}, - cache.Indexers{svcNameNamespaceIndex: svcNameNamespaceIndexFunc, svcIPIndex: svcIPIndexFunc}, - object.DefaultProcessor(object.ToService(opts.skipAPIObjectsCleanup), nil), - ) - - if opts.initPodCache { - dns.podLister, dns.podController = object.NewIndexerInformer( - &cache.ListWatch{ - ListFunc: podListFunc(ctx, dns.client, api.NamespaceAll, dns.selector), - WatchFunc: podWatchFunc(ctx, dns.client, api.NamespaceAll, dns.selector), - }, - &api.Pod{}, - cache.ResourceEventHandlerFuncs{AddFunc: dns.Add, UpdateFunc: dns.Update, DeleteFunc: dns.Delete}, - cache.Indexers{podIPIndex: podIPIndexFunc}, - object.DefaultProcessor(object.ToPod(opts.skipAPIObjectsCleanup), nil), - ) - } - - if opts.initEndpointsCache { - dns.epLister, dns.epController = object.NewIndexerInformer( - &cache.ListWatch{ - ListFunc: endpointsListFunc(ctx, dns.client, api.NamespaceAll, dns.selector), - WatchFunc: endpointsWatchFunc(ctx, dns.client, api.NamespaceAll, dns.selector), - }, - &api.Endpoints{}, - cache.ResourceEventHandlerFuncs{AddFunc: dns.Add, UpdateFunc: dns.Update, DeleteFunc: dns.Delete}, - cache.Indexers{epNameNamespaceIndex: epNameNamespaceIndexFunc, epIPIndex: epIPIndexFunc}, - object.DefaultProcessor(object.ToEndpoints(opts.skipAPIObjectsCleanup), dns.recordDNSProgrammingLatency), - ) - } - - dns.nsLister, dns.nsController = cache.NewInformer( - &cache.ListWatch{ - ListFunc: namespaceListFunc(ctx, dns.client, dns.namespaceSelector), - WatchFunc: namespaceWatchFunc(ctx, dns.client, dns.namespaceSelector), - }, - &api.Namespace{}, - defaultResyncPeriod, - cache.ResourceEventHandlerFuncs{}) - - return &dns -} - -func (dns *dnsControl) recordDNSProgrammingLatency(obj meta.Object) { - recordDNSProgrammingLatency(dns.getServices(obj.(*api.Endpoints)), obj.(*api.Endpoints)) -} - -func podIPIndexFunc(obj interface{}) ([]string, error) { - p, ok := obj.(*object.Pod) - if !ok { - return nil, errObj - } - return []string{p.PodIP}, nil -} - -func svcIPIndexFunc(obj interface{}) ([]string, error) { - svc, ok := obj.(*object.Service) - if !ok { - return nil, errObj - } - if len(svc.ExternalIPs) == 0 { - return []string{svc.ClusterIP}, nil - } - - return append([]string{svc.ClusterIP}, svc.ExternalIPs...), nil -} - -func svcNameNamespaceIndexFunc(obj interface{}) ([]string, error) { - s, ok := obj.(*object.Service) - if !ok { - return nil, errObj - } - return []string{s.Index}, nil -} - -func epNameNamespaceIndexFunc(obj interface{}) ([]string, error) { - s, ok := obj.(*object.Endpoints) - if !ok { - return nil, errObj - } - return []string{s.Index}, nil -} - -func epIPIndexFunc(obj interface{}) ([]string, error) { - ep, ok := obj.(*object.Endpoints) - if !ok { - return nil, errObj - } - return ep.IndexIP, nil -} - -func serviceListFunc(ctx context.Context, c kubernetes.Interface, ns string, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { - return func(opts meta.ListOptions) (runtime.Object, error) { - if s != nil { - opts.LabelSelector = s.String() - } - listV1, err := c.CoreV1().Services(ns).List(ctx, opts) - return listV1, err - } -} - -func podListFunc(ctx context.Context, c kubernetes.Interface, ns string, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { - return func(opts meta.ListOptions) (runtime.Object, error) { - if s != nil { - opts.LabelSelector = s.String() - } - if len(opts.FieldSelector) > 0 { - opts.FieldSelector = opts.FieldSelector + "," - } - opts.FieldSelector = opts.FieldSelector + "status.phase!=Succeeded,status.phase!=Failed,status.phase!=Unknown" - listV1, err := c.CoreV1().Pods(ns).List(ctx, opts) - return listV1, err - } -} - -func endpointsListFunc(ctx context.Context, c kubernetes.Interface, ns string, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { - return func(opts meta.ListOptions) (runtime.Object, error) { - if s != nil { - opts.LabelSelector = s.String() - } - listV1, err := c.CoreV1().Endpoints(ns).List(ctx, opts) - return listV1, err - } -} - -func namespaceListFunc(ctx context.Context, c kubernetes.Interface, s labels.Selector) func(meta.ListOptions) (runtime.Object, error) { - return func(opts meta.ListOptions) (runtime.Object, error) { - if s != nil { - opts.LabelSelector = s.String() - } - listV1, err := c.CoreV1().Namespaces().List(ctx, opts) - return listV1, err - } -} - -// Stop stops the controller. -func (dns *dnsControl) Stop() error { - dns.stopLock.Lock() - defer dns.stopLock.Unlock() - - // Only try draining the workqueue if we haven't already. - if !dns.shutdown { - close(dns.stopCh) - dns.shutdown = true - - return nil - } - - return fmt.Errorf("shutdown already in progress") -} - -// Run starts the controller. -func (dns *dnsControl) Run() { - go dns.svcController.Run(dns.stopCh) - if dns.epController != nil { - go dns.epController.Run(dns.stopCh) - } - if dns.podController != nil { - go dns.podController.Run(dns.stopCh) - } - go dns.nsController.Run(dns.stopCh) - <-dns.stopCh -} - -// HasSynced calls on all controllers. -func (dns *dnsControl) HasSynced() bool { - a := dns.svcController.HasSynced() - b := true - if dns.epController != nil { - b = dns.epController.HasSynced() - } - c := true - if dns.podController != nil { - c = dns.podController.HasSynced() - } - d := dns.nsController.HasSynced() - return a && b && c && d -} - -func (dns *dnsControl) ServiceList() (svcs []*object.Service) { - os := dns.svcLister.List() - for _, o := range os { - s, ok := o.(*object.Service) - if !ok { - continue - } - svcs = append(svcs, s) - } - return svcs -} - -func (dns *dnsControl) EndpointsList() (eps []*object.Endpoints) { - os := dns.epLister.List() - for _, o := range os { - ep, ok := o.(*object.Endpoints) - if !ok { - continue - } - eps = append(eps, ep) - } - return eps -} - -func (dns *dnsControl) PodIndex(ip string) (pods []*object.Pod) { - os, err := dns.podLister.ByIndex(podIPIndex, ip) - if err != nil { - return nil - } - for _, o := range os { - p, ok := o.(*object.Pod) - if !ok { - continue - } - pods = append(pods, p) - } - return pods -} - -func (dns *dnsControl) SvcIndex(idx string) (svcs []*object.Service) { - os, err := dns.svcLister.ByIndex(svcNameNamespaceIndex, idx) - if err != nil { - return nil - } - for _, o := range os { - s, ok := o.(*object.Service) - if !ok { - continue - } - svcs = append(svcs, s) - } - return svcs -} - -func (dns *dnsControl) SvcIndexReverse(ip string) (svcs []*object.Service) { - os, err := dns.svcLister.ByIndex(svcIPIndex, ip) - if err != nil { - return nil - } - - for _, o := range os { - s, ok := o.(*object.Service) - if !ok { - continue - } - svcs = append(svcs, s) - } - return svcs -} - -func (dns *dnsControl) EpIndex(idx string) (ep []*object.Endpoints) { - os, err := dns.epLister.ByIndex(epNameNamespaceIndex, idx) - if err != nil { - return nil - } - for _, o := range os { - e, ok := o.(*object.Endpoints) - if !ok { - continue - } - ep = append(ep, e) - } - return ep -} - -func (dns *dnsControl) EpIndexReverse(ip string) (ep []*object.Endpoints) { - os, err := dns.epLister.ByIndex(epIPIndex, ip) - if err != nil { - return nil - } - for _, o := range os { - e, ok := o.(*object.Endpoints) - if !ok { - continue - } - ep = append(ep, e) - } - return ep -} - -// GetNodeByName return the node by name. If nothing is found an error is -// returned. This query causes a roundtrip to the k8s API server, so use -// sparingly. Currently this is only used for Federation. -func (dns *dnsControl) GetNodeByName(ctx context.Context, name string) (*api.Node, error) { - v1node, err := dns.client.CoreV1().Nodes().Get(ctx, name, meta.GetOptions{}) - return v1node, err -} - -// GetNamespaceByName returns the namespace by name. If nothing is found an error is returned. -func (dns *dnsControl) GetNamespaceByName(name string) (*api.Namespace, error) { - os := dns.nsLister.List() - for _, o := range os { - ns, ok := o.(*api.Namespace) - if !ok { - continue - } - if name == ns.ObjectMeta.Name { - return ns, nil - } - } - return nil, fmt.Errorf("namespace not found") -} - -func (dns *dnsControl) Add(obj interface{}) { dns.updateModifed() } -func (dns *dnsControl) Delete(obj interface{}) { dns.updateModifed() } -func (dns *dnsControl) Update(oldObj, newObj interface{}) { dns.detectChanges(oldObj, newObj) } - -// detectChanges detects changes in objects, and updates the modified timestamp -func (dns *dnsControl) detectChanges(oldObj, newObj interface{}) { - // If both objects have the same resource version, they are identical. - if newObj != nil && oldObj != nil && (oldObj.(meta.Object).GetResourceVersion() == newObj.(meta.Object).GetResourceVersion()) { - return - } - obj := newObj - if obj == nil { - obj = oldObj - } - switch ob := obj.(type) { - case *object.Service: - dns.updateModifed() - case *object.Pod: - dns.updateModifed() - case *object.Endpoints: - if !endpointsEquivalent(oldObj.(*object.Endpoints), newObj.(*object.Endpoints)) { - dns.updateModifed() - } - default: - log.Warningf("Updates for %T not supported.", ob) - } -} - -func (dns *dnsControl) getServices(endpoints *api.Endpoints) []*object.Service { - return dns.SvcIndex(object.EndpointsKey(endpoints.GetName(), endpoints.GetNamespace())) -} - -// subsetsEquivalent checks if two endpoint subsets are significantly equivalent -// I.e. that they have the same ready addresses, host names, ports (including protocol -// and service names for SRV) -func subsetsEquivalent(sa, sb object.EndpointSubset) bool { - if len(sa.Addresses) != len(sb.Addresses) { - return false - } - if len(sa.Ports) != len(sb.Ports) { - return false - } - - // in Addresses and Ports, we should be able to rely on - // these being sorted and able to be compared - // they are supposed to be in a canonical format - for addr, aaddr := range sa.Addresses { - baddr := sb.Addresses[addr] - if aaddr.IP != baddr.IP { - return false - } - if aaddr.Hostname != baddr.Hostname { - return false - } - } - - for port, aport := range sa.Ports { - bport := sb.Ports[port] - if aport.Name != bport.Name { - return false - } - if aport.Port != bport.Port { - return false - } - if aport.Protocol != bport.Protocol { - return false - } - } - return true -} - -// endpointsEquivalent checks if the update to an endpoint is something -// that matters to us or if they are effectively equivalent. -func endpointsEquivalent(a, b *object.Endpoints) bool { - if a == nil || b == nil { - return false - } - - if len(a.Subsets) != len(b.Subsets) { - return false - } - - // we should be able to rely on - // these being sorted and able to be compared - // they are supposed to be in a canonical format - for i, sa := range a.Subsets { - sb := b.Subsets[i] - if !subsetsEquivalent(sa, sb) { - return false - } - } - return true -} - -func (dns *dnsControl) Modified() int64 { - unix := atomic.LoadInt64(&dns.modified) - return unix -} - -// updateModified set dns.modified to the current time. -func (dns *dnsControl) updateModifed() { - unix := time.Now().Unix() - atomic.StoreInt64(&dns.modified, unix) -} - -var errObj = errors.New("obj was not of the correct type") - -const defaultResyncPeriod = 0 diff --git a/go/coredns/plugin/kubernetes/external.go b/go/coredns/plugin/kubernetes/external.go deleted file mode 100644 index 56ac580cd507..000000000000 --- a/go/coredns/plugin/kubernetes/external.go +++ /dev/null @@ -1,94 +0,0 @@ -package kubernetes - -import ( - "strings" - - "github.com/inverse-inc/packetfence/go/coredns/plugin/etcd/msg" - "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes/object" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/dnsutil" - "github.com/inverse-inc/packetfence/go/coredns/request" - - "github.com/miekg/dns" -) - -// External implements the ExternalFunc call from the external plugin. -// It returns any services matching in the services' ExternalIPs. -func (k *Kubernetes) External(state request.Request) ([]msg.Service, int) { - base, _ := dnsutil.TrimZone(state.Name(), state.Zone) - - segs := dns.SplitDomainName(base) - last := len(segs) - 1 - if last < 0 { - return nil, dns.RcodeServerFailure - } - // We are dealing with a fairly normal domain name here, but we still need to have the service - // and the namespace: - // service.namespace. - // - // for service (and SRV) you can also say _tcp, and port (i.e. _http), we need those be picked - // up, unless they are not specified, then we use an internal wildcard. - port := "*" - protocol := "*" - namespace := segs[last] - if !k.namespaceExposed(namespace) { - return nil, dns.RcodeNameError - } - - last-- - if last < 0 { - return nil, dns.RcodeSuccess - } - - service := segs[last] - last-- - if last == 1 { - protocol = stripUnderscore(segs[last]) - port = stripUnderscore(segs[last-1]) - last -= 2 - } - - if last != -1 { - // too long - return nil, dns.RcodeNameError - } - - idx := object.ServiceKey(service, namespace) - serviceList := k.APIConn.SvcIndex(idx) - - services := []msg.Service{} - zonePath := msg.Path(state.Zone, coredns) - rcode := dns.RcodeNameError - - for _, svc := range serviceList { - if namespace != svc.Namespace { - continue - } - if service != svc.Name { - continue - } - - for _, ip := range svc.ExternalIPs { - for _, p := range svc.Ports { - if !(match(port, p.Name) && match(protocol, string(p.Protocol))) { - continue - } - rcode = dns.RcodeSuccess - s := msg.Service{Host: ip, Port: int(p.Port), TTL: k.ttl} - s.Key = strings.Join([]string{zonePath, svc.Namespace, svc.Name}, "/") - - services = append(services, s) - } - } - } - return services, rcode -} - -// ExternalAddress returns the external service address(es) for the CoreDNS service. -func (k *Kubernetes) ExternalAddress(state request.Request) []dns.RR { - // If CoreDNS is running inside the Kubernetes cluster: k.nsAddrs() will return the external IPs of the services - // targeting the CoreDNS Pod. - // If CoreDNS is running outside of the Kubernetes cluster: k.nsAddrs() will return the first non-loopback IP - // address seen on the local system it is running on. This could be the wrong answer if coredns is using the *bind* - // plugin to bind to a different IP address. - return k.nsAddrs(true, state.Zone) -} diff --git a/go/coredns/plugin/kubernetes/handler.go b/go/coredns/plugin/kubernetes/handler.go deleted file mode 100644 index d863bf9e8fb9..000000000000 --- a/go/coredns/plugin/kubernetes/handler.go +++ /dev/null @@ -1,89 +0,0 @@ -package kubernetes - -import ( - "context" - - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/request" - - "github.com/miekg/dns" -) - -// ServeDNS implements the plugin.Handler interface. -func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) { - state := request.Request{W: w, Req: r} - - qname := state.QName() - zone := plugin.Zones(k.Zones).Matches(qname) - if zone == "" { - return plugin.NextOrFailure(k.Name(), k.Next, ctx, w, r) - } - zone = qname[len(qname)-len(zone):] // maintain case of original query - state.Zone = zone - - var ( - records []dns.RR - extra []dns.RR - err error - ) - - switch state.QType() { - case dns.TypeA: - records, err = plugin.A(ctx, &k, zone, state, nil, plugin.Options{}) - case dns.TypeAAAA: - records, err = plugin.AAAA(ctx, &k, zone, state, nil, plugin.Options{}) - case dns.TypeTXT: - records, err = plugin.TXT(ctx, &k, zone, state, nil, plugin.Options{}) - case dns.TypeCNAME: - records, err = plugin.CNAME(ctx, &k, zone, state, plugin.Options{}) - case dns.TypePTR: - records, err = plugin.PTR(ctx, &k, zone, state, plugin.Options{}) - case dns.TypeMX: - records, extra, err = plugin.MX(ctx, &k, zone, state, plugin.Options{}) - case dns.TypeSRV: - records, extra, err = plugin.SRV(ctx, &k, zone, state, plugin.Options{}) - case dns.TypeSOA: - records, err = plugin.SOA(ctx, &k, zone, state, plugin.Options{}) - case dns.TypeNS: - if state.Name() == zone { - records, extra, err = plugin.NS(ctx, &k, zone, state, plugin.Options{}) - break - } - fallthrough - default: - // Do a fake A lookup, so we can distinguish between NODATA and NXDOMAIN - fake := state.NewWithQuestion(state.QName(), dns.TypeA) - fake.Zone = state.Zone - _, err = plugin.A(ctx, &k, zone, fake, nil, plugin.Options{}) - } - - if k.IsNameError(err) { - if k.Fall.Through(state.Name()) { - return plugin.NextOrFailure(k.Name(), k.Next, ctx, w, r) - } - if !k.APIConn.HasSynced() { - // If we haven't synchronized with the kubernetes cluster, return server failure - return plugin.BackendError(ctx, &k, zone, dns.RcodeServerFailure, state, nil /* err */, plugin.Options{}) - } - return plugin.BackendError(ctx, &k, zone, dns.RcodeNameError, state, nil /* err */, plugin.Options{}) - } - if err != nil { - return dns.RcodeServerFailure, err - } - - if len(records) == 0 { - return plugin.BackendError(ctx, &k, zone, dns.RcodeSuccess, state, nil, plugin.Options{}) - } - - m := new(dns.Msg) - m.SetReply(r) - m.Authoritative = true - m.Answer = append(m.Answer, records...) - m.Extra = append(m.Extra, extra...) - - w.WriteMsg(m) - return dns.RcodeSuccess, nil -} - -// Name implements the Handler interface. -func (k Kubernetes) Name() string { return "kubernetes" } diff --git a/go/coredns/plugin/kubernetes/kubernetes.go b/go/coredns/plugin/kubernetes/kubernetes.go deleted file mode 100644 index fe144f0228b3..000000000000 --- a/go/coredns/plugin/kubernetes/kubernetes.go +++ /dev/null @@ -1,519 +0,0 @@ -// Package kubernetes provides the kubernetes backend. -package kubernetes - -import ( - "context" - "errors" - "fmt" - "net" - "strings" - - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/etcd/msg" - "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes/object" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/dnsutil" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/fall" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/upstream" - "github.com/inverse-inc/packetfence/go/coredns/request" - - "github.com/miekg/dns" - api "k8s.io/api/core/v1" - meta "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" - "k8s.io/client-go/tools/clientcmd" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" -) - -// Kubernetes implements a plugin that connects to a Kubernetes cluster. -type Kubernetes struct { - Next plugin.Handler - Zones []string - Upstream *upstream.Upstream - APIServerList []string - APICertAuth string - APIClientCert string - APIClientKey string - ClientConfig clientcmd.ClientConfig - APIConn dnsController - Namespaces map[string]struct{} - podMode string - endpointNameMode bool - Fall fall.F - ttl uint32 - opts dnsControlOpts - primaryZoneIndex int - localIPs []net.IP - autoPathSearch []string // Local search path from /etc/resolv.conf. Needed for autopath. -} - -// New returns a initialized Kubernetes. It default interfaceAddrFunc to return 127.0.0.1. All other -// values default to their zero value, primaryZoneIndex will thus point to the first zone. -func New(zones []string) *Kubernetes { - k := new(Kubernetes) - k.Zones = zones - k.Namespaces = make(map[string]struct{}) - k.podMode = podModeDisabled - k.ttl = defaultTTL - - return k -} - -const ( - // podModeDisabled is the default value where pod requests are ignored - podModeDisabled = "disabled" - // podModeVerified is where Pod requests are answered only if they exist - podModeVerified = "verified" - // podModeInsecure is where pod requests are answered without verifying they exist - podModeInsecure = "insecure" - // DNSSchemaVersion is the schema version: https://github.com/kubernetes/dns/blob/master/docs/specification.md - DNSSchemaVersion = "1.1.0" - // Svc is the DNS schema for kubernetes services - Svc = "svc" - // Pod is the DNS schema for kubernetes pods - Pod = "pod" - // defaultTTL to apply to all answers. - defaultTTL = 5 -) - -var ( - errNoItems = errors.New("no items found") - errNsNotExposed = errors.New("namespace is not exposed") - errInvalidRequest = errors.New("invalid query name") -) - -// Services implements the ServiceBackend interface. -func (k *Kubernetes) Services(ctx context.Context, state request.Request, exact bool, opt plugin.Options) (svcs []msg.Service, err error) { - // We're looking again at types, which we've already done in ServeDNS, but there are some types k8s just can't answer. - switch state.QType() { - - case dns.TypeTXT: - // 1 label + zone, label must be "dns-version". - t, _ := dnsutil.TrimZone(state.Name(), state.Zone) - - segs := dns.SplitDomainName(t) - if len(segs) != 1 { - return nil, nil - } - if segs[0] != "dns-version" { - return nil, nil - } - svc := msg.Service{Text: DNSSchemaVersion, TTL: 28800, Key: msg.Path(state.QName(), coredns)} - return []msg.Service{svc}, nil - - case dns.TypeNS: - // We can only get here if the qname equals the zone, see ServeDNS in handler.go. - nss := k.nsAddrs(false, state.Zone) - var svcs []msg.Service - for _, ns := range nss { - if ns.Header().Rrtype == dns.TypeA { - svcs = append(svcs, msg.Service{Host: ns.(*dns.A).A.String(), Key: msg.Path(ns.Header().Name, coredns), TTL: k.ttl}) - continue - } - if ns.Header().Rrtype == dns.TypeAAAA { - svcs = append(svcs, msg.Service{Host: ns.(*dns.AAAA).AAAA.String(), Key: msg.Path(ns.Header().Name, coredns), TTL: k.ttl}) - } - } - return svcs, nil - } - - if isDefaultNS(state.Name(), state.Zone) { - nss := k.nsAddrs(false, state.Zone) - var svcs []msg.Service - for _, ns := range nss { - if ns.Header().Rrtype == dns.TypeA && state.QType() == dns.TypeA { - svcs = append(svcs, msg.Service{Host: ns.(*dns.A).A.String(), Key: msg.Path(state.QName(), coredns), TTL: k.ttl}) - continue - } - if ns.Header().Rrtype == dns.TypeAAAA && state.QType() == dns.TypeAAAA { - svcs = append(svcs, msg.Service{Host: ns.(*dns.AAAA).AAAA.String(), Key: msg.Path(state.QName(), coredns), TTL: k.ttl}) - } - } - return svcs, nil - } - - s, e := k.Records(ctx, state, false) - - // SRV for external services is not yet implemented, so remove those records. - - if state.QType() != dns.TypeSRV { - return s, e - } - - internal := []msg.Service{} - for _, svc := range s { - if t, _ := svc.HostType(); t != dns.TypeCNAME { - internal = append(internal, svc) - } - } - - return internal, e -} - -// primaryZone will return the first non-reverse zone being handled by this plugin -func (k *Kubernetes) primaryZone() string { return k.Zones[k.primaryZoneIndex] } - -// Lookup implements the ServiceBackend interface. -func (k *Kubernetes) Lookup(ctx context.Context, state request.Request, name string, typ uint16) (*dns.Msg, error) { - return k.Upstream.Lookup(ctx, state, name, typ) -} - -// IsNameError implements the ServiceBackend interface. -func (k *Kubernetes) IsNameError(err error) bool { - return err == errNoItems || err == errNsNotExposed || err == errInvalidRequest -} - -func (k *Kubernetes) getClientConfig() (*rest.Config, error) { - if k.ClientConfig != nil { - return k.ClientConfig.ClientConfig() - } - loadingRules := &clientcmd.ClientConfigLoadingRules{} - overrides := &clientcmd.ConfigOverrides{} - clusterinfo := clientcmdapi.Cluster{} - authinfo := clientcmdapi.AuthInfo{} - - // Connect to API from in cluster - if len(k.APIServerList) == 0 { - cc, err := rest.InClusterConfig() - if err != nil { - return nil, err - } - cc.ContentType = "application/vnd.kubernetes.protobuf" - return cc, err - } - - // Connect to API from out of cluster - // Only the first one is used. We will deprecate multiple endpoints later. - clusterinfo.Server = k.APIServerList[0] - - if len(k.APICertAuth) > 0 { - clusterinfo.CertificateAuthority = k.APICertAuth - } - if len(k.APIClientCert) > 0 { - authinfo.ClientCertificate = k.APIClientCert - } - if len(k.APIClientKey) > 0 { - authinfo.ClientKey = k.APIClientKey - } - - overrides.ClusterInfo = clusterinfo - overrides.AuthInfo = authinfo - clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides) - - cc, err := clientConfig.ClientConfig() - if err != nil { - return nil, err - } - cc.ContentType = "application/vnd.kubernetes.protobuf" - return cc, err - -} - -// InitKubeCache initializes a new Kubernetes cache. -func (k *Kubernetes) InitKubeCache(ctx context.Context) (err error) { - config, err := k.getClientConfig() - if err != nil { - return err - } - - kubeClient, err := kubernetes.NewForConfig(config) - if err != nil { - return fmt.Errorf("failed to create kubernetes notification controller: %q", err) - } - - if k.opts.labelSelector != nil { - var selector labels.Selector - selector, err = meta.LabelSelectorAsSelector(k.opts.labelSelector) - if err != nil { - return fmt.Errorf("unable to create Selector for LabelSelector '%s': %q", k.opts.labelSelector, err) - } - k.opts.selector = selector - } - - if k.opts.namespaceLabelSelector != nil { - var selector labels.Selector - selector, err = meta.LabelSelectorAsSelector(k.opts.namespaceLabelSelector) - if err != nil { - return fmt.Errorf("unable to create Selector for LabelSelector '%s': %q", k.opts.namespaceLabelSelector, err) - } - k.opts.namespaceSelector = selector - } - - k.opts.initPodCache = k.podMode == podModeVerified - - k.opts.zones = k.Zones - k.opts.endpointNameMode = k.endpointNameMode - k.APIConn = newdnsController(ctx, kubeClient, k.opts) - - return err -} - -// Records looks up services in kubernetes. -func (k *Kubernetes) Records(ctx context.Context, state request.Request, exact bool) ([]msg.Service, error) { - r, e := parseRequest(state.Name(), state.Zone) - if e != nil { - return nil, e - } - if r.podOrSvc == "" { - return nil, nil - } - - if dnsutil.IsReverse(state.Name()) > 0 { - return nil, errNoItems - } - - if !wildcard(r.namespace) && !k.namespaceExposed(r.namespace) { - return nil, errNsNotExposed - } - - if r.podOrSvc == Pod { - pods, err := k.findPods(r, state.Zone) - return pods, err - } - - services, err := k.findServices(r, state.Zone) - return services, err -} - -func endpointHostname(addr object.EndpointAddress, endpointNameMode bool) string { - if addr.Hostname != "" { - return addr.Hostname - } - if endpointNameMode && addr.TargetRefName != "" { - return addr.TargetRefName - } - if strings.Contains(addr.IP, ".") { - return strings.Replace(addr.IP, ".", "-", -1) - } - if strings.Contains(addr.IP, ":") { - return strings.Replace(addr.IP, ":", "-", -1) - } - return "" -} - -func (k *Kubernetes) findPods(r recordRequest, zone string) (pods []msg.Service, err error) { - if k.podMode == podModeDisabled { - return nil, errNoItems - } - - namespace := r.namespace - if !wildcard(namespace) && !k.namespaceExposed(namespace) { - return nil, errNoItems - } - - podname := r.service - - // handle empty pod name - if podname == "" { - if k.namespaceExposed(namespace) || wildcard(namespace) { - // NODATA - return nil, nil - } - // NXDOMAIN - return nil, errNoItems - } - - zonePath := msg.Path(zone, coredns) - ip := "" - if strings.Count(podname, "-") == 3 && !strings.Contains(podname, "--") { - ip = strings.Replace(podname, "-", ".", -1) - } else { - ip = strings.Replace(podname, "-", ":", -1) - } - - if k.podMode == podModeInsecure { - if !wildcard(namespace) && !k.namespaceExposed(namespace) { // no wildcard, but namespace does not exist - return nil, errNoItems - } - - // If ip does not parse as an IP address, we return an error, otherwise we assume a CNAME and will try to resolve it in backend_lookup.go - if net.ParseIP(ip) == nil { - return nil, errNoItems - } - - return []msg.Service{{Key: strings.Join([]string{zonePath, Pod, namespace, podname}, "/"), Host: ip, TTL: k.ttl}}, err - } - - // PodModeVerified - err = errNoItems - if wildcard(podname) && !wildcard(namespace) { - // If namespace exists, err should be nil, so that we return NODATA instead of NXDOMAIN - if k.namespaceExposed(namespace) { - err = nil - } - } - - for _, p := range k.APIConn.PodIndex(ip) { - // If namespace has a wildcard, filter results against Corefile namespace list. - if wildcard(namespace) && !k.namespaceExposed(p.Namespace) { - continue - } - - // check for matching ip and namespace - if ip == p.PodIP && match(namespace, p.Namespace) { - s := msg.Service{Key: strings.Join([]string{zonePath, Pod, namespace, podname}, "/"), Host: ip, TTL: k.ttl} - pods = append(pods, s) - - err = nil - } - } - return pods, err -} - -// findServices returns the services matching r from the cache. -func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.Service, err error) { - if !wildcard(r.namespace) && !k.namespaceExposed(r.namespace) { - return nil, errNoItems - } - - // handle empty service name - if r.service == "" { - if k.namespaceExposed(r.namespace) || wildcard(r.namespace) { - // NODATA - return nil, nil - } - // NXDOMAIN - return nil, errNoItems - } - - err = errNoItems - if wildcard(r.service) && !wildcard(r.namespace) { - // If namespace exists, err should be nil, so that we return NODATA instead of NXDOMAIN - if k.namespaceExposed(r.namespace) { - err = nil - } - } - - var ( - endpointsListFunc func() []*object.Endpoints - endpointsList []*object.Endpoints - serviceList []*object.Service - ) - - if wildcard(r.service) || wildcard(r.namespace) { - serviceList = k.APIConn.ServiceList() - endpointsListFunc = func() []*object.Endpoints { return k.APIConn.EndpointsList() } - } else { - idx := object.ServiceKey(r.service, r.namespace) - serviceList = k.APIConn.SvcIndex(idx) - endpointsListFunc = func() []*object.Endpoints { return k.APIConn.EpIndex(idx) } - } - - zonePath := msg.Path(zone, coredns) - for _, svc := range serviceList { - if !(match(r.namespace, svc.Namespace) && match(r.service, svc.Name)) { - continue - } - - // If request namespace is a wildcard, filter results against Corefile namespace list. - // (Namespaces without a wildcard were filtered before the call to this function.) - if wildcard(r.namespace) && !k.namespaceExposed(svc.Namespace) { - continue - } - - // If "ignore empty_service" option is set and no endpoints exist, return NXDOMAIN unless - // it's a headless or externalName service (covered below). - if k.opts.ignoreEmptyService && svc.ClusterIP != api.ClusterIPNone && svc.Type != api.ServiceTypeExternalName { - // serve NXDOMAIN if no endpoint is able to answer - podsCount := 0 - for _, ep := range endpointsListFunc() { - for _, eps := range ep.Subsets { - podsCount = podsCount + len(eps.Addresses) - } - } - - if podsCount == 0 { - continue - } - } - - // Endpoint query or headless service - if svc.ClusterIP == api.ClusterIPNone || r.endpoint != "" { - if endpointsList == nil { - endpointsList = endpointsListFunc() - } - for _, ep := range endpointsList { - if ep.Name != svc.Name || ep.Namespace != svc.Namespace { - continue - } - - for _, eps := range ep.Subsets { - for _, addr := range eps.Addresses { - - // See comments in parse.go parseRequest about the endpoint handling. - if r.endpoint != "" { - if !match(r.endpoint, endpointHostname(addr, k.endpointNameMode)) { - continue - } - } - - for _, p := range eps.Ports { - if !(match(r.port, p.Name) && match(r.protocol, string(p.Protocol))) { - continue - } - s := msg.Service{Host: addr.IP, Port: int(p.Port), TTL: k.ttl} - s.Key = strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name, endpointHostname(addr, k.endpointNameMode)}, "/") - - err = nil - - services = append(services, s) - } - } - } - } - continue - } - - // External service - if svc.Type == api.ServiceTypeExternalName { - s := msg.Service{Key: strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/"), Host: svc.ExternalName, TTL: k.ttl} - if t, _ := s.HostType(); t == dns.TypeCNAME { - s.Key = strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/") - services = append(services, s) - - err = nil - } - continue - } - - // ClusterIP service - for _, p := range svc.Ports { - if !(match(r.port, p.Name) && match(r.protocol, string(p.Protocol))) { - continue - } - - err = nil - - s := msg.Service{Host: svc.ClusterIP, Port: int(p.Port), TTL: k.ttl} - s.Key = strings.Join([]string{zonePath, Svc, svc.Namespace, svc.Name}, "/") - - services = append(services, s) - } - } - return services, err -} - -// Serial return the SOA serial. -func (k *Kubernetes) Serial(state request.Request) uint32 { return uint32(k.APIConn.Modified()) } - -// MinTTL returns the minimal TTL. -func (k *Kubernetes) MinTTL(state request.Request) uint32 { return k.ttl } - -// match checks if a and b are equal taking wildcards into account. -func match(a, b string) bool { - if wildcard(a) { - return true - } - if wildcard(b) { - return true - } - return strings.EqualFold(a, b) -} - -// wildcard checks whether s contains a wildcard value defined as "*" or "any". -func wildcard(s string) bool { - return s == "*" || s == "any" -} - -const coredns = "c" // used as a fake key prefix in msg.Service diff --git a/go/coredns/plugin/kubernetes/local.go b/go/coredns/plugin/kubernetes/local.go deleted file mode 100644 index bd89daad676f..000000000000 --- a/go/coredns/plugin/kubernetes/local.go +++ /dev/null @@ -1,37 +0,0 @@ -package kubernetes - -import ( - "net" - - "github.com/coredns/caddy" - "github.com/inverse-inc/packetfence/go/coredns/core/dnsserver" -) - -// boundIPs returns the list of non-loopback IPs that CoreDNS is bound to -func boundIPs(c *caddy.Controller) (ips []net.IP) { - conf := dnsserver.GetConfig(c) - hosts := conf.ListenHosts - if hosts == nil || hosts[0] == "" { - hosts = nil - addrs, err := net.InterfaceAddrs() - if err != nil { - return nil - } - for _, addr := range addrs { - hosts = append(hosts, addr.String()) - } - } - for _, host := range hosts { - ip, _, _ := net.ParseCIDR(host) - ip4 := ip.To4() - if ip4 != nil && !ip4.IsLoopback() { - ips = append(ips, ip4) - continue - } - ip6 := ip.To16() - if ip6 != nil && !ip6.IsLoopback() { - ips = append(ips, ip6) - } - } - return ips -} diff --git a/go/coredns/plugin/kubernetes/metadata.go b/go/coredns/plugin/kubernetes/metadata.go deleted file mode 100644 index b9d44bb8b5e1..000000000000 --- a/go/coredns/plugin/kubernetes/metadata.go +++ /dev/null @@ -1,62 +0,0 @@ -package kubernetes - -import ( - "context" - - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/metadata" - "github.com/inverse-inc/packetfence/go/coredns/request" -) - -// Metadata implements the metadata.Provider interface. -func (k *Kubernetes) Metadata(ctx context.Context, state request.Request) context.Context { - pod := k.podWithIP(state.IP()) - if pod != nil { - metadata.SetValueFunc(ctx, "kubernetes/client-namespace", func() string { - return pod.Namespace - }) - - metadata.SetValueFunc(ctx, "kubernetes/client-pod-name", func() string { - return pod.Name - }) - } - - zone := plugin.Zones(k.Zones).Matches(state.Name()) - if zone == "" { - return ctx - } - // possible optimization: cache r so it doesn't need to be calculated again in ServeDNS - r, err := parseRequest(state.Name(), zone) - if err != nil { - metadata.SetValueFunc(ctx, "kubernetes/parse-error", func() string { - return err.Error() - }) - return ctx - } - - metadata.SetValueFunc(ctx, "kubernetes/port-name", func() string { - return r.port - }) - - metadata.SetValueFunc(ctx, "kubernetes/protocol", func() string { - return r.protocol - }) - - metadata.SetValueFunc(ctx, "kubernetes/endpoint", func() string { - return r.endpoint - }) - - metadata.SetValueFunc(ctx, "kubernetes/service", func() string { - return r.service - }) - - metadata.SetValueFunc(ctx, "kubernetes/namespace", func() string { - return r.namespace - }) - - metadata.SetValueFunc(ctx, "kubernetes/kind", func() string { - return r.podOrSvc - }) - - return ctx -} diff --git a/go/coredns/plugin/kubernetes/metrics.go b/go/coredns/plugin/kubernetes/metrics.go deleted file mode 100644 index 4acd51829b85..000000000000 --- a/go/coredns/plugin/kubernetes/metrics.go +++ /dev/null @@ -1,73 +0,0 @@ -package kubernetes - -import ( - "time" - - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes/object" - - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promauto" - api "k8s.io/api/core/v1" -) - -var ( - // DnsProgrammingLatency is defined as the time it took to program a DNS instance - from the time - // a service or pod has changed to the time the change was propagated and was available to be - // served by a DNS server. - // The definition of this SLI can be found at https://github.com/kubernetes/community/blob/master/sig-scalability/slos/dns_programming_latency.md - // Note that the metrics is partially based on the time exported by the endpoints controller on - // the master machine. The measurement may be inaccurate if there is a clock drift between the - // node and master machine. - // The service_kind label can be one of: - // * cluster_ip - // * headless_with_selector - // * headless_without_selector - DnsProgrammingLatency = promauto.NewHistogramVec(prometheus.HistogramOpts{ - Namespace: plugin.Namespace, - Subsystem: pluginName, - Name: "dns_programming_duration_seconds", - // From 1 millisecond to ~17 minutes. - Buckets: prometheus.ExponentialBuckets(0.001, 2, 20), - Help: "Histogram of the time (in seconds) it took to program a dns instance.", - }, []string{"service_kind"}) - - // durationSinceFunc returns the duration elapsed since the given time. - // Added as a global variable to allow injection for testing. - durationSinceFunc = time.Since -) - -func recordDNSProgrammingLatency(svcs []*object.Service, endpoints *api.Endpoints) { - // getLastChangeTriggerTime is the time.Time value of the EndpointsLastChangeTriggerTime - // annotation stored in the given endpoints object or the "zero" time if the annotation wasn't set - var lastChangeTriggerTime time.Time - stringVal, ok := endpoints.Annotations[api.EndpointsLastChangeTriggerTime] - if ok { - ts, err := time.Parse(time.RFC3339Nano, stringVal) - if err != nil { - log.Warningf("DnsProgrammingLatency cannot be calculated for Endpoints '%s/%s'; invalid %q annotation RFC3339 value of %q", - endpoints.GetNamespace(), endpoints.GetName(), api.EndpointsLastChangeTriggerTime, stringVal) - // In case of error val = time.Zero, which is ignored in the upstream code. - } - lastChangeTriggerTime = ts - } - - // isHeadless indicates whether the endpoints object belongs to a headless - // service (i.e. clusterIp = None). Note that this can be a false negatives if the service - // informer is lagging, i.e. we may not see a recently created service. Given that the services - // don't change very often (comparing to much more frequent endpoints changes), cases when this method - // will return wrong answer should be relatively rare. Because of that we intentionally accept this - // flaw to keep the solution simple. - isHeadless := len(svcs) == 1 && svcs[0].ClusterIP == api.ClusterIPNone - - if endpoints == nil || !isHeadless || lastChangeTriggerTime.IsZero() { - return - } - - // If we're here it means that the Endpoints object is for a headless service and that - // the Endpoints object was created by the endpoints-controller (because the - // LastChangeTriggerTime annotation is set). It means that the corresponding service is a - // "headless service with selector". - DnsProgrammingLatency.WithLabelValues("headless_with_selector"). - Observe(durationSinceFunc(lastChangeTriggerTime).Seconds()) -} diff --git a/go/coredns/plugin/kubernetes/namespace.go b/go/coredns/plugin/kubernetes/namespace.go deleted file mode 100644 index 6eab13867054..000000000000 --- a/go/coredns/plugin/kubernetes/namespace.go +++ /dev/null @@ -1,27 +0,0 @@ -package kubernetes - -// filteredNamespaceExists checks if namespace exists in this cluster -// according to any `namespace_labels` plugin configuration specified. -// Returns true even for namespaces not exposed by plugin configuration, -// see namespaceExposed. -func (k *Kubernetes) filteredNamespaceExists(namespace string) bool { - ns, err := k.APIConn.GetNamespaceByName(namespace) - if err != nil { - return false - } - return ns.ObjectMeta.Name == namespace -} - -// configuredNamespace returns true when the namespace is exposed through the plugin -// `namespaces` configuration. -func (k *Kubernetes) configuredNamespace(namespace string) bool { - _, ok := k.Namespaces[namespace] - if len(k.Namespaces) > 0 && !ok { - return false - } - return true -} - -func (k *Kubernetes) namespaceExposed(namespace string) bool { - return k.configuredNamespace(namespace) && k.filteredNamespaceExists(namespace) -} diff --git a/go/coredns/plugin/kubernetes/ns.go b/go/coredns/plugin/kubernetes/ns.go deleted file mode 100644 index 7e855c0903d2..000000000000 --- a/go/coredns/plugin/kubernetes/ns.go +++ /dev/null @@ -1,90 +0,0 @@ -package kubernetes - -import ( - "net" - "strings" - - "github.com/inverse-inc/packetfence/go/coredns/plugin/kubernetes/object" - "github.com/miekg/dns" - api "k8s.io/api/core/v1" -) - -func isDefaultNS(name, zone string) bool { - return strings.Index(name, defaultNSName) == 0 && strings.Index(name, zone) == len(defaultNSName) -} - -// nsAddrs returns the A or AAAA records for the CoreDNS service in the cluster. If the service cannot be found, -// it returns a record for the local address of the machine we're running on. -func (k *Kubernetes) nsAddrs(external bool, zone string) []dns.RR { - var ( - svcNames []string - svcIPs []net.IP - ) - - // Find the CoreDNS Endpoints - for _, localIP := range k.localIPs { - endpoints := k.APIConn.EpIndexReverse(localIP.String()) - - // Collect IPs for all Services of the Endpoints - for _, endpoint := range endpoints { - svcs := k.APIConn.SvcIndex(object.ServiceKey(endpoint.Name, endpoint.Namespace)) - for _, svc := range svcs { - if external { - svcName := strings.Join([]string{svc.Name, svc.Namespace, zone}, ".") - for _, exIP := range svc.ExternalIPs { - svcNames = append(svcNames, svcName) - svcIPs = append(svcIPs, net.ParseIP(exIP)) - } - continue - } - svcName := strings.Join([]string{svc.Name, svc.Namespace, Svc, zone}, ".") - if svc.ClusterIP == api.ClusterIPNone { - // For a headless service, use the endpoints IPs - for _, s := range endpoint.Subsets { - for _, a := range s.Addresses { - svcNames = append(svcNames, endpointHostname(a, k.endpointNameMode)+"."+svcName) - svcIPs = append(svcIPs, net.ParseIP(a.IP)) - } - } - } else { - svcNames = append(svcNames, svcName) - svcIPs = append(svcIPs, net.ParseIP(svc.ClusterIP)) - } - } - } - } - - // If no local IPs matched any endpoints, use the localIPs directly - if len(svcIPs) == 0 { - svcIPs = make([]net.IP, len(k.localIPs)) - svcNames = make([]string, len(k.localIPs)) - for i, localIP := range k.localIPs { - svcNames[i] = defaultNSName + zone - svcIPs[i] = localIP - } - } - - // Create an RR slice of collected IPs - rrs := make([]dns.RR, len(svcIPs)) - for i, ip := range svcIPs { - if ip.To4() == nil { - rr := new(dns.AAAA) - rr.Hdr.Class = dns.ClassINET - rr.Hdr.Rrtype = dns.TypeAAAA - rr.Hdr.Name = svcNames[i] - rr.AAAA = ip - rrs[i] = rr - continue - } - rr := new(dns.A) - rr.Hdr.Class = dns.ClassINET - rr.Hdr.Rrtype = dns.TypeA - rr.Hdr.Name = svcNames[i] - rr.A = ip - rrs[i] = rr - } - - return rrs -} - -const defaultNSName = "ns.dns." diff --git a/go/coredns/plugin/kubernetes/object/endpoint.go b/go/coredns/plugin/kubernetes/object/endpoint.go deleted file mode 100644 index d4c495861dbf..000000000000 --- a/go/coredns/plugin/kubernetes/object/endpoint.go +++ /dev/null @@ -1,173 +0,0 @@ -package object - -import ( - "fmt" - - api "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" -) - -// Endpoints is a stripped down api.Endpoints with only the items we need for CoreDNS. -type Endpoints struct { - // Don't add new fields to this struct without talking to the CoreDNS maintainers. - Version string - Name string - Namespace string - Index string - IndexIP []string - Subsets []EndpointSubset - - *Empty -} - -// EndpointSubset is a group of addresses with a common set of ports. The -// expanded set of endpoints is the Cartesian product of Addresses x Ports. -type EndpointSubset struct { - Addresses []EndpointAddress - Ports []EndpointPort -} - -// EndpointAddress is a tuple that describes single IP address. -type EndpointAddress struct { - IP string - Hostname string - NodeName string - TargetRefName string -} - -// EndpointPort is a tuple that describes a single port. -type EndpointPort struct { - Port int32 - Name string - Protocol string -} - -// EndpointsKey returns a string using for the index. -func EndpointsKey(name, namespace string) string { return name + "." + namespace } - -// ToEndpoints returns a function that converts an *api.Endpoints to a *Endpoints. -func ToEndpoints(skipCleanup bool) ToFunc { - return func(obj interface{}) (interface{}, error) { - eps, ok := obj.(*api.Endpoints) - if !ok { - return nil, fmt.Errorf("unexpected object %v", obj) - } - return toEndpoints(skipCleanup, eps), nil - } -} - -// toEndpoints converts an *api.Endpoints to a *Endpoints. -func toEndpoints(skipCleanup bool, end *api.Endpoints) *Endpoints { - e := &Endpoints{ - Version: end.GetResourceVersion(), - Name: end.GetName(), - Namespace: end.GetNamespace(), - Index: EndpointsKey(end.GetName(), end.GetNamespace()), - Subsets: make([]EndpointSubset, len(end.Subsets)), - } - for i, eps := range end.Subsets { - sub := EndpointSubset{ - Addresses: make([]EndpointAddress, len(eps.Addresses)), - } - if len(eps.Ports) == 0 { - // Add sentinel if there are no ports. - sub.Ports = []EndpointPort{{Port: -1}} - } else { - sub.Ports = make([]EndpointPort, len(eps.Ports)) - } - - for j, a := range eps.Addresses { - ea := EndpointAddress{IP: a.IP, Hostname: a.Hostname} - if a.NodeName != nil { - ea.NodeName = *a.NodeName - } - if a.TargetRef != nil { - ea.TargetRefName = a.TargetRef.Name - } - sub.Addresses[j] = ea - } - - for k, p := range eps.Ports { - ep := EndpointPort{Port: p.Port, Name: p.Name, Protocol: string(p.Protocol)} - sub.Ports[k] = ep - } - - e.Subsets[i] = sub - } - - for _, eps := range end.Subsets { - for _, a := range eps.Addresses { - e.IndexIP = append(e.IndexIP, a.IP) - } - } - - if !skipCleanup { - *end = api.Endpoints{} - } - - return e -} - -// CopyWithoutSubsets copies e, without the subsets. -func (e *Endpoints) CopyWithoutSubsets() *Endpoints { - e1 := &Endpoints{ - Version: e.Version, - Name: e.Name, - Namespace: e.Namespace, - Index: e.Index, - IndexIP: make([]string, len(e.IndexIP)), - } - copy(e1.IndexIP, e.IndexIP) - return e1 -} - -var _ runtime.Object = &Endpoints{} - -// DeepCopyObject implements the ObjectKind interface. -func (e *Endpoints) DeepCopyObject() runtime.Object { - e1 := &Endpoints{ - Version: e.Version, - Name: e.Name, - Namespace: e.Namespace, - Index: e.Index, - IndexIP: make([]string, len(e.IndexIP)), - Subsets: make([]EndpointSubset, len(e.Subsets)), - } - copy(e1.IndexIP, e.IndexIP) - - for i, eps := range e.Subsets { - sub := EndpointSubset{ - Addresses: make([]EndpointAddress, len(eps.Addresses)), - Ports: make([]EndpointPort, len(eps.Ports)), - } - for j, a := range eps.Addresses { - ea := EndpointAddress{IP: a.IP, Hostname: a.Hostname, NodeName: a.NodeName, TargetRefName: a.TargetRefName} - sub.Addresses[j] = ea - } - for k, p := range eps.Ports { - ep := EndpointPort{Port: p.Port, Name: p.Name, Protocol: p.Protocol} - sub.Ports[k] = ep - } - - e1.Subsets[i] = sub - } - return e1 -} - -// GetNamespace implements the metav1.Object interface. -func (e *Endpoints) GetNamespace() string { return e.Namespace } - -// SetNamespace implements the metav1.Object interface. -func (e *Endpoints) SetNamespace(namespace string) {} - -// GetName implements the metav1.Object interface. -func (e *Endpoints) GetName() string { return e.Name } - -// SetName implements the metav1.Object interface. -func (e *Endpoints) SetName(name string) {} - -// GetResourceVersion implements the metav1.Object interface. -func (e *Endpoints) GetResourceVersion() string { return e.Version } - -// SetResourceVersion implements the metav1.Object interface. -func (e *Endpoints) SetResourceVersion(version string) {} diff --git a/go/coredns/plugin/kubernetes/object/informer.go b/go/coredns/plugin/kubernetes/object/informer.go deleted file mode 100644 index f37af4796fac..000000000000 --- a/go/coredns/plugin/kubernetes/object/informer.go +++ /dev/null @@ -1,76 +0,0 @@ -package object - -import ( - meta "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/tools/cache" -) - -// NewIndexerInformer is a copy of the cache.NewIndexerInformer function, but allows custom process function -func NewIndexerInformer(lw cache.ListerWatcher, objType runtime.Object, h cache.ResourceEventHandler, indexers cache.Indexers, builder ProcessorBuilder) (cache.Indexer, cache.Controller) { - clientState := cache.NewIndexer(cache.DeletionHandlingMetaNamespaceKeyFunc, indexers) - - cfg := &cache.Config{ - Queue: cache.NewDeltaFIFO(cache.MetaNamespaceKeyFunc, clientState), - ListerWatcher: lw, - ObjectType: objType, - FullResyncPeriod: defaultResyncPeriod, - RetryOnError: false, - Process: builder(clientState, h), - } - return clientState, cache.New(cfg) -} - -type recordLatencyFunc func(meta.Object) - -// DefaultProcessor is based on the Process function from cache.NewIndexerInformer except it does a conversion. -func DefaultProcessor(convert ToFunc, recordLatency recordLatencyFunc) ProcessorBuilder { - return func(clientState cache.Indexer, h cache.ResourceEventHandler) cache.ProcessFunc { - return func(obj interface{}) error { - for _, d := range obj.(cache.Deltas) { - switch d.Type { - case cache.Sync, cache.Added, cache.Updated: - obj, err := convert(d.Object) - if err != nil { - return err - } - if old, exists, err := clientState.Get(obj); err == nil && exists { - if err := clientState.Update(obj); err != nil { - return err - } - h.OnUpdate(old, obj) - } else { - if err := clientState.Add(obj); err != nil { - return err - } - h.OnAdd(obj) - } - if recordLatency != nil { - recordLatency(d.Object.(meta.Object)) - } - case cache.Deleted: - var obj interface{} - obj, ok := d.Object.(cache.DeletedFinalStateUnknown) - if !ok { - var err error - obj, err = convert(d.Object) - if err != nil && err != errPodTerminating { - return err - } - } - - if err := clientState.Delete(obj); err != nil { - return err - } - h.OnDelete(obj) - if !ok && recordLatency != nil { - recordLatency(d.Object.(meta.Object)) - } - } - } - return nil - } - } -} - -const defaultResyncPeriod = 0 diff --git a/go/coredns/plugin/kubernetes/object/object.go b/go/coredns/plugin/kubernetes/object/object.go deleted file mode 100644 index f591f6d0ae48..000000000000 --- a/go/coredns/plugin/kubernetes/object/object.go +++ /dev/null @@ -1,113 +0,0 @@ -// Package object holds functions that convert the objects from the k8s API in -// to a more memory efficient structures. -// -// Adding new fields to any of the structures defined in pod.go, endpoint.go -// and service.go should not be done lightly as this increases the memory use -// and will leads to OOMs in the k8s scale test. -// -// We can do some optimizations here as well. We store IP addresses as strings, -// this might be moved to uint32 (for v4) for instance, but then we need to -// convert those again. -// -// Also the msg.Service use in this plugin may be deprecated at some point, as -// we don't use most of those features anyway and would free us from the *etcd* -// dependency, where msg.Service is defined. And should save some mem/cpu as we -// convert to and from msg.Services. -package object - -import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/tools/cache" -) - -// ToFunc converts one empty interface to another. -type ToFunc func(interface{}) (interface{}, error) - -// ProcessorBuilder returns function to process cache events. -type ProcessorBuilder func(cache.Indexer, cache.ResourceEventHandler) cache.ProcessFunc - -// Empty is an empty struct. -type Empty struct{} - -// GetObjectKind implements the ObjectKind interface as a noop. -func (e *Empty) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } - -// GetGenerateName implements the metav1.Object interface. -func (e *Empty) GetGenerateName() string { return "" } - -// SetGenerateName implements the metav1.Object interface. -func (e *Empty) SetGenerateName(name string) {} - -// GetUID implements the metav1.Object interface. -func (e *Empty) GetUID() types.UID { return "" } - -// SetUID implements the metav1.Object interface. -func (e *Empty) SetUID(uid types.UID) {} - -// GetGeneration implements the metav1.Object interface. -func (e *Empty) GetGeneration() int64 { return 0 } - -// SetGeneration implements the metav1.Object interface. -func (e *Empty) SetGeneration(generation int64) {} - -// GetSelfLink implements the metav1.Object interface. -func (e *Empty) GetSelfLink() string { return "" } - -// SetSelfLink implements the metav1.Object interface. -func (e *Empty) SetSelfLink(selfLink string) {} - -// GetCreationTimestamp implements the metav1.Object interface. -func (e *Empty) GetCreationTimestamp() v1.Time { return v1.Time{} } - -// SetCreationTimestamp implements the metav1.Object interface. -func (e *Empty) SetCreationTimestamp(timestamp v1.Time) {} - -// GetDeletionTimestamp implements the metav1.Object interface. -func (e *Empty) GetDeletionTimestamp() *v1.Time { return &v1.Time{} } - -// SetDeletionTimestamp implements the metav1.Object interface. -func (e *Empty) SetDeletionTimestamp(timestamp *v1.Time) {} - -// GetDeletionGracePeriodSeconds implements the metav1.Object interface. -func (e *Empty) GetDeletionGracePeriodSeconds() *int64 { return nil } - -// SetDeletionGracePeriodSeconds implements the metav1.Object interface. -func (e *Empty) SetDeletionGracePeriodSeconds(*int64) {} - -// GetLabels implements the metav1.Object interface. -func (e *Empty) GetLabels() map[string]string { return nil } - -// SetLabels implements the metav1.Object interface. -func (e *Empty) SetLabels(labels map[string]string) {} - -// GetAnnotations implements the metav1.Object interface. -func (e *Empty) GetAnnotations() map[string]string { return nil } - -// SetAnnotations implements the metav1.Object interface. -func (e *Empty) SetAnnotations(annotations map[string]string) {} - -// GetFinalizers implements the metav1.Object interface. -func (e *Empty) GetFinalizers() []string { return nil } - -// SetFinalizers implements the metav1.Object interface. -func (e *Empty) SetFinalizers(finalizers []string) {} - -// GetOwnerReferences implements the metav1.Object interface. -func (e *Empty) GetOwnerReferences() []v1.OwnerReference { return nil } - -// SetOwnerReferences implements the metav1.Object interface. -func (e *Empty) SetOwnerReferences([]v1.OwnerReference) {} - -// GetClusterName implements the metav1.Object interface. -func (e *Empty) GetClusterName() string { return "" } - -// SetClusterName implements the metav1.Object interface. -func (e *Empty) SetClusterName(clusterName string) {} - -// GetManagedFields implements the metav1.Object interface. -func (e *Empty) GetManagedFields() []v1.ManagedFieldsEntry { return nil } - -// SetManagedFields implements the metav1.Object interface. -func (e *Empty) SetManagedFields(managedFields []v1.ManagedFieldsEntry) {} diff --git a/go/coredns/plugin/kubernetes/object/pod.go b/go/coredns/plugin/kubernetes/object/pod.go deleted file mode 100644 index 04cbe1ad23bf..000000000000 --- a/go/coredns/plugin/kubernetes/object/pod.go +++ /dev/null @@ -1,86 +0,0 @@ -package object - -import ( - "errors" - "fmt" - - api "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" -) - -// Pod is a stripped down api.Pod with only the items we need for CoreDNS. -type Pod struct { - // Don't add new fields to this struct without talking to the CoreDNS maintainers. - Version string - PodIP string - Name string - Namespace string - - *Empty -} - -var errPodTerminating = errors.New("pod terminating") - -// ToPod returns a function that converts an api.Pod to a *Pod. -func ToPod(skipCleanup bool) ToFunc { - return func(obj interface{}) (interface{}, error) { - apiPod, ok := obj.(*api.Pod) - if !ok { - return nil, fmt.Errorf("unexpected object %v", obj) - } - pod := toPod(skipCleanup, apiPod) - t := apiPod.ObjectMeta.DeletionTimestamp - if t != nil && !(*t).Time.IsZero() { - // if the pod is in the process of termination, return an error so it can be ignored - // during add/update event processing - return pod, errPodTerminating - } - return pod, nil - } -} - -func toPod(skipCleanup bool, pod *api.Pod) *Pod { - p := &Pod{ - Version: pod.GetResourceVersion(), - PodIP: pod.Status.PodIP, - Namespace: pod.GetNamespace(), - Name: pod.GetName(), - } - - if !skipCleanup { - *pod = api.Pod{} - } - - return p -} - -var _ runtime.Object = &Pod{} - -// DeepCopyObject implements the ObjectKind interface. -func (p *Pod) DeepCopyObject() runtime.Object { - p1 := &Pod{ - Version: p.Version, - PodIP: p.PodIP, - Namespace: p.Namespace, - Name: p.Name, - } - return p1 -} - -// GetNamespace implements the metav1.Object interface. -func (p *Pod) GetNamespace() string { return p.Namespace } - -// SetNamespace implements the metav1.Object interface. -func (p *Pod) SetNamespace(namespace string) {} - -// GetName implements the metav1.Object interface. -func (p *Pod) GetName() string { return p.Name } - -// SetName implements the metav1.Object interface. -func (p *Pod) SetName(name string) {} - -// GetResourceVersion implements the metav1.Object interface. -func (p *Pod) GetResourceVersion() string { return p.Version } - -// SetResourceVersion implements the metav1.Object interface. -func (p *Pod) SetResourceVersion(version string) {} diff --git a/go/coredns/plugin/kubernetes/object/service.go b/go/coredns/plugin/kubernetes/object/service.go deleted file mode 100644 index de84cf9410d1..000000000000 --- a/go/coredns/plugin/kubernetes/object/service.go +++ /dev/null @@ -1,116 +0,0 @@ -package object - -import ( - "fmt" - - api "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" -) - -// Service is a stripped down api.Service with only the items we need for CoreDNS. -type Service struct { - // Don't add new fields to this struct without talking to the CoreDNS maintainers. - Version string - Name string - Namespace string - Index string - ClusterIP string - Type api.ServiceType - ExternalName string - Ports []api.ServicePort - - // ExternalIPs we may want to export. - ExternalIPs []string - - *Empty -} - -// ServiceKey returns a string using for the index. -func ServiceKey(name, namespace string) string { return name + "." + namespace } - -// ToService returns a function that converts an api.Service to a *Service. -func ToService(skipCleanup bool) ToFunc { - return func(obj interface{}) (interface{}, error) { - svc, ok := obj.(*api.Service) - if !ok { - return nil, fmt.Errorf("unexpected object %v", obj) - } - return toService(skipCleanup, svc), nil - } -} - -func toService(skipCleanup bool, svc *api.Service) *Service { - s := &Service{ - Version: svc.GetResourceVersion(), - Name: svc.GetName(), - Namespace: svc.GetNamespace(), - Index: ServiceKey(svc.GetName(), svc.GetNamespace()), - ClusterIP: svc.Spec.ClusterIP, - Type: svc.Spec.Type, - ExternalName: svc.Spec.ExternalName, - - ExternalIPs: make([]string, len(svc.Status.LoadBalancer.Ingress)+len(svc.Spec.ExternalIPs)), - } - - if len(svc.Spec.Ports) == 0 { - // Add sentinel if there are no ports. - s.Ports = []api.ServicePort{{Port: -1}} - } else { - s.Ports = make([]api.ServicePort, len(svc.Spec.Ports)) - copy(s.Ports, svc.Spec.Ports) - } - - li := copy(s.ExternalIPs, svc.Spec.ExternalIPs) - for i, lb := range svc.Status.LoadBalancer.Ingress { - if lb.IP != "" { - s.ExternalIPs[li+i] = lb.IP - continue - } - s.ExternalIPs[li+i] = lb.Hostname - - } - - if !skipCleanup { - *svc = api.Service{} - } - - return s -} - -var _ runtime.Object = &Service{} - -// DeepCopyObject implements the ObjectKind interface. -func (s *Service) DeepCopyObject() runtime.Object { - s1 := &Service{ - Version: s.Version, - Name: s.Name, - Namespace: s.Namespace, - Index: s.Index, - ClusterIP: s.ClusterIP, - Type: s.Type, - ExternalName: s.ExternalName, - Ports: make([]api.ServicePort, len(s.Ports)), - ExternalIPs: make([]string, len(s.ExternalIPs)), - } - copy(s1.Ports, s.Ports) - copy(s1.ExternalIPs, s.ExternalIPs) - return s1 -} - -// GetNamespace implements the metav1.Object interface. -func (s *Service) GetNamespace() string { return s.Namespace } - -// SetNamespace implements the metav1.Object interface. -func (s *Service) SetNamespace(namespace string) {} - -// GetName implements the metav1.Object interface. -func (s *Service) GetName() string { return s.Name } - -// SetName implements the metav1.Object interface. -func (s *Service) SetName(name string) {} - -// GetResourceVersion implements the metav1.Object interface. -func (s *Service) GetResourceVersion() string { return s.Version } - -// SetResourceVersion implements the metav1.Object interface. -func (s *Service) SetResourceVersion(version string) {} diff --git a/go/coredns/plugin/kubernetes/parse.go b/go/coredns/plugin/kubernetes/parse.go deleted file mode 100644 index 7c51a57ef55a..000000000000 --- a/go/coredns/plugin/kubernetes/parse.go +++ /dev/null @@ -1,112 +0,0 @@ -package kubernetes - -import ( - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/dnsutil" - "github.com/miekg/dns" -) - -type recordRequest struct { - // The named port from the kubernetes DNS spec, this is the service part (think _https) from a well formed - // SRV record. - port string - // The protocol is usually _udp or _tcp (if set), and comes from the protocol part of a well formed - // SRV record. - protocol string - endpoint string - // The servicename used in Kubernetes. - service string - // The namespace used in Kubernetes. - namespace string - // A each name can be for a pod or a service, here we track what we've seen, either "pod" or "service". - podOrSvc string -} - -// parseRequest parses the qname to find all the elements we need for querying k8s. Anything -// that is not parsed will have the wildcard "*" value (except r.endpoint). -// Potential underscores are stripped from _port and _protocol. -func parseRequest(name, zone string) (r recordRequest, err error) { - // 3 Possible cases: - // 1. _port._protocol.service.namespace.pod|svc.zone - // 2. (endpoint): endpoint.service.namespace.pod|svc.zone - // 3. (service): service.namespace.pod|svc.zone - - base, _ := dnsutil.TrimZone(name, zone) - // return NODATA for apex queries - if base == "" || base == Svc || base == Pod { - return r, nil - } - segs := dns.SplitDomainName(base) - - r.port = "*" - r.protocol = "*" - // for r.name, r.namespace and r.endpoint, we need to know if they have been set or not... - // For endpoint: if empty we should skip the endpoint check in k.get(). Hence we cannot set if to "*". - // For name: myns.svc.cluster.local != *.myns.svc.cluster.local - // For namespace: svc.cluster.local != *.svc.cluster.local - - // start at the right and fill out recordRequest with the bits we find, so we look for - // pod|svc.namespace.service and then either - // * endpoint - // *_protocol._port - - last := len(segs) - 1 - if last < 0 { - return r, nil - } - r.podOrSvc = segs[last] - if r.podOrSvc != Pod && r.podOrSvc != Svc { - return r, errInvalidRequest - } - last-- - if last < 0 { - return r, nil - } - - r.namespace = segs[last] - last-- - if last < 0 { - return r, nil - } - - r.service = segs[last] - last-- - if last < 0 { - return r, nil - } - - // Because of ambiguity we check the labels left: 1: an endpoint. 2: port and protocol. - // Anything else is a query that is too long to answer and can safely be delegated to return an nxdomain. - switch last { - - case 0: // endpoint only - r.endpoint = segs[last] - case 1: // service and port - r.protocol = stripUnderscore(segs[last]) - r.port = stripUnderscore(segs[last-1]) - - default: // too long - return r, errInvalidRequest - } - - return r, nil -} - -// stripUnderscore removes a prefixed underscore from s. -func stripUnderscore(s string) string { - if s[0] != '_' { - return s - } - return s[1:] -} - -// String returns a string representation of r, it just returns all fields concatenated with dots. -// This is mostly used in tests. -func (r recordRequest) String() string { - s := r.port - s += "." + r.protocol - s += "." + r.endpoint - s += "." + r.service - s += "." + r.namespace - s += "." + r.podOrSvc - return s -} diff --git a/go/coredns/plugin/kubernetes/ready.go b/go/coredns/plugin/kubernetes/ready.go deleted file mode 100644 index 2625f3b5ad59..000000000000 --- a/go/coredns/plugin/kubernetes/ready.go +++ /dev/null @@ -1,4 +0,0 @@ -package kubernetes - -// Ready implements the ready.Readiness interface. -func (k *Kubernetes) Ready() bool { return k.APIConn.HasSynced() } diff --git a/go/coredns/plugin/kubernetes/reverse.go b/go/coredns/plugin/kubernetes/reverse.go deleted file mode 100644 index 5b39b50de6dd..000000000000 --- a/go/coredns/plugin/kubernetes/reverse.go +++ /dev/null @@ -1,56 +0,0 @@ -package kubernetes - -import ( - "context" - "strings" - - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/etcd/msg" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/dnsutil" - "github.com/inverse-inc/packetfence/go/coredns/request" -) - -// Reverse implements the ServiceBackend interface. -func (k *Kubernetes) Reverse(ctx context.Context, state request.Request, exact bool, opt plugin.Options) ([]msg.Service, error) { - - ip := dnsutil.ExtractAddressFromReverse(state.Name()) - if ip == "" { - _, e := k.Records(ctx, state, exact) - return nil, e - } - - records := k.serviceRecordForIP(ip, state.Name()) - if len(records) == 0 { - return records, errNoItems - } - return records, nil -} - -// serviceRecordForIP gets a service record with a cluster ip matching the ip argument -// If a service cluster ip does not match, it checks all endpoints -func (k *Kubernetes) serviceRecordForIP(ip, name string) []msg.Service { - // First check services with cluster ips - for _, service := range k.APIConn.SvcIndexReverse(ip) { - if len(k.Namespaces) > 0 && !k.namespaceExposed(service.Namespace) { - continue - } - domain := strings.Join([]string{service.Name, service.Namespace, Svc, k.primaryZone()}, ".") - return []msg.Service{{Host: domain, TTL: k.ttl}} - } - // If no cluster ips match, search endpoints - var svcs []msg.Service - for _, ep := range k.APIConn.EpIndexReverse(ip) { - if len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) { - continue - } - for _, eps := range ep.Subsets { - for _, addr := range eps.Addresses { - if addr.IP == ip { - domain := strings.Join([]string{endpointHostname(addr, k.endpointNameMode), ep.Name, ep.Namespace, Svc, k.primaryZone()}, ".") - svcs = append(svcs, msg.Service{Host: domain, TTL: k.ttl}) - } - } - } - } - return svcs -} diff --git a/go/coredns/plugin/kubernetes/setup.go b/go/coredns/plugin/kubernetes/setup.go deleted file mode 100644 index 6bcfdeb60294..000000000000 --- a/go/coredns/plugin/kubernetes/setup.go +++ /dev/null @@ -1,283 +0,0 @@ -package kubernetes - -import ( - "context" - "errors" - "fmt" - "os" - "strconv" - "strings" - "time" - - "github.com/coredns/caddy" - "github.com/inverse-inc/packetfence/go/coredns/core/dnsserver" - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/dnsutil" - clog "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/log" - "github.com/inverse-inc/packetfence/go/coredns/plugin/pkg/upstream" - - "github.com/miekg/dns" - meta "k8s.io/apimachinery/pkg/apis/meta/v1" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s - _ "k8s.io/client-go/plugin/pkg/client/auth/openstack" // pull this in here, because we want it excluded if plugin.cfg doesn't have k8s - "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" -) - -const pluginName = "kubernetes" - -var log = clog.NewWithPlugin(pluginName) - -func init() { plugin.Register(pluginName, setup) } - -func setup(c *caddy.Controller) error { - klog.SetOutput(os.Stdout) - - k, err := kubernetesParse(c) - if err != nil { - return plugin.Error(pluginName, err) - } - - err = k.InitKubeCache(context.Background()) - if err != nil { - return plugin.Error(pluginName, err) - } - - k.RegisterKubeCache(c) - - dnsserver.GetConfig(c).AddPlugin(func(next plugin.Handler) plugin.Handler { - k.Next = next - return k - }) - - // get locally bound addresses - c.OnStartup(func() error { - k.localIPs = boundIPs(c) - return nil - }) - - return nil -} - -// RegisterKubeCache registers KubeCache start and stop functions with Caddy -func (k *Kubernetes) RegisterKubeCache(c *caddy.Controller) { - c.OnStartup(func() error { - go k.APIConn.Run() - - timeout := time.After(5 * time.Second) - ticker := time.NewTicker(100 * time.Millisecond) - for { - select { - case <-ticker.C: - if k.APIConn.HasSynced() { - return nil - } - case <-timeout: - return nil - } - } - }) - - c.OnShutdown(func() error { - return k.APIConn.Stop() - }) -} - -func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { - var ( - k8s *Kubernetes - err error - ) - - i := 0 - for c.Next() { - if i > 0 { - return nil, plugin.ErrOnce - } - i++ - - k8s, err = ParseStanza(c) - if err != nil { - return k8s, err - } - } - return k8s, nil -} - -// ParseStanza parses a kubernetes stanza -func ParseStanza(c *caddy.Controller) (*Kubernetes, error) { - - k8s := New([]string{""}) - k8s.autoPathSearch = searchFromResolvConf() - - opts := dnsControlOpts{ - initEndpointsCache: true, - ignoreEmptyService: false, - } - k8s.opts = opts - - zones := c.RemainingArgs() - - if len(zones) != 0 { - k8s.Zones = zones - for i := 0; i < len(k8s.Zones); i++ { - k8s.Zones[i] = plugin.Host(k8s.Zones[i]).Normalize() - } - } else { - k8s.Zones = make([]string, len(c.ServerBlockKeys)) - for i := 0; i < len(c.ServerBlockKeys); i++ { - k8s.Zones[i] = plugin.Host(c.ServerBlockKeys[i]).Normalize() - } - } - - k8s.primaryZoneIndex = -1 - for i, z := range k8s.Zones { - if dnsutil.IsReverse(z) > 0 { - continue - } - k8s.primaryZoneIndex = i - break - } - - if k8s.primaryZoneIndex == -1 { - return nil, errors.New("non-reverse zone name must be used") - } - - k8s.Upstream = upstream.New() - - for c.NextBlock() { - switch c.Val() { - case "endpoint_pod_names": - args := c.RemainingArgs() - if len(args) > 0 { - return nil, c.ArgErr() - } - k8s.endpointNameMode = true - continue - case "pods": - args := c.RemainingArgs() - if len(args) == 1 { - switch args[0] { - case podModeDisabled, podModeInsecure, podModeVerified: - k8s.podMode = args[0] - default: - return nil, fmt.Errorf("wrong value for pods: %s, must be one of: disabled, verified, insecure", args[0]) - } - continue - } - return nil, c.ArgErr() - case "namespaces": - args := c.RemainingArgs() - if len(args) > 0 { - for _, a := range args { - k8s.Namespaces[a] = struct{}{} - } - continue - } - return nil, c.ArgErr() - case "endpoint": - args := c.RemainingArgs() - if len(args) > 0 { - // Multiple endpoints are deprecated but still could be specified, - // only the first one be used, though - k8s.APIServerList = args - if len(args) > 1 { - log.Warningf("Multiple endpoints have been deprecated, only the first specified endpoint '%s' is used", args[0]) - } - continue - } - return nil, c.ArgErr() - case "tls": // cert key cacertfile - args := c.RemainingArgs() - if len(args) == 3 { - k8s.APIClientCert, k8s.APIClientKey, k8s.APICertAuth = args[0], args[1], args[2] - continue - } - return nil, c.ArgErr() - case "labels": - args := c.RemainingArgs() - if len(args) > 0 { - labelSelectorString := strings.Join(args, " ") - ls, err := meta.ParseToLabelSelector(labelSelectorString) - if err != nil { - return nil, fmt.Errorf("unable to parse label selector value: '%v': %v", labelSelectorString, err) - } - k8s.opts.labelSelector = ls - continue - } - return nil, c.ArgErr() - case "namespace_labels": - args := c.RemainingArgs() - if len(args) > 0 { - namespaceLabelSelectorString := strings.Join(args, " ") - nls, err := meta.ParseToLabelSelector(namespaceLabelSelectorString) - if err != nil { - return nil, fmt.Errorf("unable to parse namespace_label selector value: '%v': %v", namespaceLabelSelectorString, err) - } - k8s.opts.namespaceLabelSelector = nls - continue - } - return nil, c.ArgErr() - case "fallthrough": - k8s.Fall.SetZonesFromArgs(c.RemainingArgs()) - case "ttl": - args := c.RemainingArgs() - if len(args) == 0 { - return nil, c.ArgErr() - } - t, err := strconv.Atoi(args[0]) - if err != nil { - return nil, err - } - if t < 0 || t > 3600 { - return nil, c.Errf("ttl must be in range [0, 3600]: %d", t) - } - k8s.ttl = uint32(t) - case "noendpoints": - if len(c.RemainingArgs()) != 0 { - return nil, c.ArgErr() - } - k8s.opts.initEndpointsCache = false - case "ignore": - args := c.RemainingArgs() - if len(args) > 0 { - ignore := args[0] - if ignore == "empty_service" { - k8s.opts.ignoreEmptyService = true - continue - } else { - return nil, fmt.Errorf("unable to parse ignore value: '%v'", ignore) - } - } - case "kubeconfig": - args := c.RemainingArgs() - if len(args) == 2 { - config := clientcmd.NewNonInteractiveDeferredLoadingClientConfig( - &clientcmd.ClientConfigLoadingRules{ExplicitPath: args[0]}, - &clientcmd.ConfigOverrides{CurrentContext: args[1]}, - ) - k8s.ClientConfig = config - continue - } - return nil, c.ArgErr() - default: - return nil, c.Errf("unknown property '%s'", c.Val()) - } - } - - if len(k8s.Namespaces) != 0 && k8s.opts.namespaceLabelSelector != nil { - return nil, c.Errf("namespaces and namespace_labels cannot both be set") - } - - return k8s, nil -} - -func searchFromResolvConf() []string { - rc, err := dns.ClientConfigFromFile("/etc/resolv.conf") - if err != nil { - return nil - } - plugin.Zones(rc.Search).Normalize() - return rc.Search -} diff --git a/go/coredns/plugin/kubernetes/watch.go b/go/coredns/plugin/kubernetes/watch.go deleted file mode 100644 index d15ed4cf99e6..000000000000 --- a/go/coredns/plugin/kubernetes/watch.go +++ /dev/null @@ -1,54 +0,0 @@ -package kubernetes - -import ( - "context" - - meta "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/kubernetes" -) - -func serviceWatchFunc(ctx context.Context, c kubernetes.Interface, ns string, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { - return func(options meta.ListOptions) (watch.Interface, error) { - if s != nil { - options.LabelSelector = s.String() - } - w, err := c.CoreV1().Services(ns).Watch(ctx, options) - return w, err - } -} - -func podWatchFunc(ctx context.Context, c kubernetes.Interface, ns string, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { - return func(options meta.ListOptions) (watch.Interface, error) { - if s != nil { - options.LabelSelector = s.String() - } - if len(options.FieldSelector) > 0 { - options.FieldSelector = options.FieldSelector + "," - } - options.FieldSelector = options.FieldSelector + "status.phase!=Succeeded,status.phase!=Failed,status.phase!=Unknown" - w, err := c.CoreV1().Pods(ns).Watch(ctx, options) - return w, err - } -} - -func endpointsWatchFunc(ctx context.Context, c kubernetes.Interface, ns string, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { - return func(options meta.ListOptions) (watch.Interface, error) { - if s != nil { - options.LabelSelector = s.String() - } - w, err := c.CoreV1().Endpoints(ns).Watch(ctx, options) - return w, err - } -} - -func namespaceWatchFunc(ctx context.Context, c kubernetes.Interface, s labels.Selector) func(options meta.ListOptions) (watch.Interface, error) { - return func(options meta.ListOptions) (watch.Interface, error) { - if s != nil { - options.LabelSelector = s.String() - } - w, err := c.CoreV1().Namespaces().Watch(ctx, options) - return w, err - } -} diff --git a/go/coredns/plugin/kubernetes/xfr.go b/go/coredns/plugin/kubernetes/xfr.go deleted file mode 100644 index cab02bd4a44a..000000000000 --- a/go/coredns/plugin/kubernetes/xfr.go +++ /dev/null @@ -1,182 +0,0 @@ -package kubernetes - -import ( - "context" - "math" - "net" - "sort" - "strings" - - "github.com/inverse-inc/packetfence/go/coredns/plugin" - "github.com/inverse-inc/packetfence/go/coredns/plugin/etcd/msg" - "github.com/inverse-inc/packetfence/go/coredns/plugin/transfer" - "github.com/inverse-inc/packetfence/go/coredns/request" - - "github.com/miekg/dns" - api "k8s.io/api/core/v1" -) - -// Transfer implements the transfer.Transfer interface. -func (k *Kubernetes) Transfer(zone string, serial uint32) (<-chan []dns.RR, error) { - // state is not used here, hence the empty request.Request{] - soa, err := plugin.SOA(context.TODO(), k, zone, request.Request{}, plugin.Options{}) - if err != nil { - return nil, transfer.ErrNotAuthoritative - } - - ch := make(chan []dns.RR) - - zonePath := msg.Path(zone, "coredns") - serviceList := k.APIConn.ServiceList() - - go func() { - // ixfr fallback - if serial != 0 && soa[0].(*dns.SOA).Serial == serial { - ch <- soa - close(ch) - return - } - ch <- soa - - sort.Slice(serviceList, func(i, j int) bool { - return serviceList[i].Name < serviceList[j].Name - }) - - for _, svc := range serviceList { - if !k.namespaceExposed(svc.Namespace) { - continue - } - svcBase := []string{zonePath, Svc, svc.Namespace, svc.Name} - switch svc.Type { - - case api.ServiceTypeClusterIP, api.ServiceTypeNodePort, api.ServiceTypeLoadBalancer: - clusterIP := net.ParseIP(svc.ClusterIP) - if clusterIP != nil { - s := msg.Service{Host: svc.ClusterIP, TTL: k.ttl} - s.Key = strings.Join(svcBase, "/") - - // Change host from IP to Name for SRV records - host := emitAddressRecord(ch, s) - - for _, p := range svc.Ports { - s := msg.Service{Host: host, Port: int(p.Port), TTL: k.ttl} - s.Key = strings.Join(svcBase, "/") - - // Need to generate this to handle use cases for peer-finder - // ref: https://github.com/inverse-inc/packetfence/go/coredns/pull/823 - ch <- []dns.RR{s.NewSRV(msg.Domain(s.Key), 100)} - - // As per spec unnamed ports do not have a srv record - // https://github.com/kubernetes/dns/blob/master/docs/specification.md#232---srv-records - if p.Name == "" { - continue - } - - s.Key = strings.Join(append(svcBase, strings.ToLower("_"+string(p.Protocol)), strings.ToLower("_"+string(p.Name))), "/") - - ch <- []dns.RR{s.NewSRV(msg.Domain(s.Key), 100)} - } - - // Skip endpoint discovery if clusterIP is defined - continue - } - - endpointsList := k.APIConn.EpIndex(svc.Name + "." + svc.Namespace) - - for _, ep := range endpointsList { - if ep.Name != svc.Name || ep.Namespace != svc.Namespace { - continue - } - - for _, eps := range ep.Subsets { - srvWeight := calcSRVWeight(len(eps.Addresses)) - for _, addr := range eps.Addresses { - s := msg.Service{Host: addr.IP, TTL: k.ttl} - s.Key = strings.Join(svcBase, "/") - // We don't need to change the msg.Service host from IP to Name yet - // so disregard the return value here - emitAddressRecord(ch, s) - - s.Key = strings.Join(append(svcBase, endpointHostname(addr, k.endpointNameMode)), "/") - // Change host from IP to Name for SRV records - host := emitAddressRecord(ch, s) - s.Host = host - - for _, p := range eps.Ports { - // As per spec unnamed ports do not have a srv record - // https://github.com/kubernetes/dns/blob/master/docs/specification.md#232---srv-records - if p.Name == "" { - continue - } - - s.Port = int(p.Port) - - s.Key = strings.Join(append(svcBase, strings.ToLower("_"+string(p.Protocol)), strings.ToLower("_"+string(p.Name))), "/") - ch <- []dns.RR{s.NewSRV(msg.Domain(s.Key), srvWeight)} - } - } - } - } - - case api.ServiceTypeExternalName: - - s := msg.Service{Key: strings.Join(svcBase, "/"), Host: svc.ExternalName, TTL: k.ttl} - if t, _ := s.HostType(); t == dns.TypeCNAME { - ch <- []dns.RR{s.NewCNAME(msg.Domain(s.Key), s.Host)} - } - } - } - ch <- soa - close(ch) - }() - return ch, nil -} - -// emitAddressRecord generates a new A or AAAA record based on the msg.Service and writes it to a channel. -// emitAddressRecord returns the host name from the generated record. -func emitAddressRecord(c chan<- []dns.RR, s msg.Service) string { - ip := net.ParseIP(s.Host) - dnsType, _ := s.HostType() - switch dnsType { - case dns.TypeA: - r := s.NewA(msg.Domain(s.Key), ip) - c <- []dns.RR{r} - return r.Hdr.Name - case dns.TypeAAAA: - r := s.NewAAAA(msg.Domain(s.Key), ip) - c <- []dns.RR{r} - return r.Hdr.Name - } - - return "" -} - -// calcSrvWeight borrows the logic implemented in plugin.SRV for dynamically -// calculating the srv weight and priority -func calcSRVWeight(numservices int) uint16 { - var services []msg.Service - - for i := 0; i < numservices; i++ { - services = append(services, msg.Service{}) - } - - w := make(map[int]int) - for _, serv := range services { - weight := 100 - if serv.Weight != 0 { - weight = serv.Weight - } - if _, ok := w[serv.Priority]; !ok { - w[serv.Priority] = weight - continue - } - w[serv.Priority] += weight - } - weight := uint16(math.Floor((100.0 / float64(w[0])) * 100)) - // weight should be at least 1 - if weight == 0 { - weight = 1 - } - - return weight -} diff --git a/go/cron/config.go b/go/cron/config.go index c861da7e8c4d..8cedf87ad9ae 100644 --- a/go/cron/config.go +++ b/go/cron/config.go @@ -20,19 +20,20 @@ type JobSetupConfig interface { } var builders = map[string]func(map[string]interface{}) JobSetupConfig{ - "fingerbank_data_update": NewFingerbankDataUpdate, - "certificates_check": NewCertificatesCheck, - "pki_certificates_check": NewPkiCertificatesCheck, - "file_logger": NewFileLogger, - "cleanup_chi_database_cache": NewChiCleanup, - "bandwidth_maintenance": NewBandwidthMaintenance, - "ip4log_cleanup": NewIp4logCleanup, - "ip6log_cleanup": NewIp6logCleanup, - "purge_binary_logs": MakeSingleWindowSqlJobSetupConfig(`PURGE BINARY LOGS BEFORE (NOW() - INTERVAL ? SECOND)`), - "admin_api_audit_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM admin_api_audit_log WHERE created_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), - "auth_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM auth_log WHERE attempted_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), - "dns_audit_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM dns_audit_log WHERE created_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), - "radius_audit_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM radius_audit_log WHERE created_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), + "fingerbank_data_update": NewFingerbankDataUpdate, + "certificates_check": NewCertificatesCheck, + "pki_certificates_check": NewPkiCertificatesCheck, + "file_logger": NewFileLogger, + "cleanup_chi_database_cache": NewChiCleanup, + "bandwidth_maintenance": NewBandwidthMaintenance, + "ip4log_cleanup": NewIp4logCleanup, + "ip6log_cleanup": NewIp6logCleanup, + "purge_binary_logs": MakeSingleWindowSqlJobSetupConfig(`PURGE BINARY LOGS BEFORE (NOW() - INTERVAL ? SECOND)`), + "admin_api_audit_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM admin_api_audit_log WHERE created_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), + "auth_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM auth_log WHERE attempted_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), + "dns_audit_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM dns_audit_log WHERE created_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), + "radius_audit_log_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM radius_audit_log WHERE created_at < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), + "node_current_session_cleanup": MakeWindowSqlJobSetupConfig(`DELETE FROM node_current_session_cleanup WHERE updated < DATE_SUB(?, INTERVAL ? SECOND) LIMIT ?`), "locationlog_cleanup": MakeMultiWindowSqlJobSetupConfig( `DELETE FROM locationlog_history WHERE end_time < DATE_SUB(?, INTERVAL ? SECOND) AND end_time != '0000-00-00 00:00:00' LIMIT ?`, `DELETE FROM locationlog WHERE end_time < DATE_SUB(?, INTERVAL ? SECOND) AND end_time != '0000-00-00 00:00:00' LIMIT ?`, diff --git a/go/firewallsso/contentkeeper.go b/go/firewallsso/contentkeeper.go new file mode 100644 index 000000000000..ab2851c9e758 --- /dev/null +++ b/go/firewallsso/contentkeeper.go @@ -0,0 +1,64 @@ +package firewallsso + +import ( + "context" + "fmt" + "net" + + "time" + + radius "github.com/inverse-inc/go-radius" + "github.com/inverse-inc/go-radius/rfc2865" + "github.com/inverse-inc/go-radius/rfc2866" + "github.com/inverse-inc/go-radius/rfc2869" + "github.com/inverse-inc/go-utils/log" + "github.com/inverse-inc/go-utils/sharedutils" +) + +type ContentKeeper struct { + FirewallSSO + Password string `json:"password"` + Port string `json:"port"` +} + +// Send an SSO start to the ContentKeeper firewall +// Returns an error unless there is a valid reply from the firewall +func (fw *ContentKeeper) Start(ctx context.Context, info map[string]string, timeout int) (bool, error) { + p := fw.startRadiusPacket(ctx, info, timeout) + client := fw.getRadiusClient(ctx) + + var err error + client.Dialer.LocalAddr, err = net.ResolveUDPAddr("udp", fw.getSourceIp(ctx).String()+":0") + sharedutils.CheckError(err) + + // Use the background context since we don't want the lib to use our context + ctx2, cancel := fw.RadiusContextWithTimeout() + defer cancel() + _, err = client.Exchange(ctx2, p, fw.PfconfigHashNS+":"+fw.Port) + if err != nil { + log.LoggerWContext(ctx).Error(fmt.Sprintf("Couldn't SSO to the ContentKeeper, got the following error: %s", err)) + return false, err + } else { + return true, nil + } +} + +// Build the RADIUS packet for an SSO start +func (fw *ContentKeeper) startRadiusPacket(ctx context.Context, info map[string]string, timeout int) *radius.Packet { + r := radius.New(radius.CodeAccountingRequest, []byte(fw.Password)) + rfc2866.AcctStatusType_Add(r, rfc2866.AcctStatusType_Value_Start) + rfc2865.UserName_AddString(r, info["username"]) + rfc2865.CalledStationID_AddString(r, "00:11:22:33:44:55") + rfc2865.FramedIPAddress_Add(r, net.ParseIP(info["ip"])) + rfc2865.CallingStationID_AddString(r, info["mac"]) + rfc2869.EventTimestamp_Add(r, time.Now()) + + return r +} + +// Send an SSO stop to the ContentKeeper firewall +// Returns an error unless there is a valid reply from the firewall +func (fw *ContentKeeper) Stop(ctx context.Context, info map[string]string) (bool, error) { + log.LoggerWContext(ctx).Info("Not supported sending SSO to ContentKeeper using RADIUS") + return true, nil +} diff --git a/go/firewallsso/contentkeeper_test.go b/go/firewallsso/contentkeeper_test.go new file mode 100644 index 000000000000..e9c9b8dc5acb --- /dev/null +++ b/go/firewallsso/contentkeeper_test.go @@ -0,0 +1,61 @@ +package firewallsso + +import ( + "testing" + + "github.com/inverse-inc/go-radius/rfc2865" + "github.com/inverse-inc/go-radius/rfc2866" + //"github.com/davecgh/go-spew/spew" +) + +func TestContentKeeperStartRadiusPacket(t *testing.T) { + f := WatchGuard{Password: "secret"} + + p := f.startRadiusPacket(ctx, sampleInfo, 86400) + + if rfc2866.AcctStatusType_Get(p) != 1 { + t.Errorf("Incorrect Acct-Status-Type in SSO packet.") + } + + if rfc2865.FramedIPAddress_Get(p).String() != sampleInfo["ip"] { + t.Errorf("Incorrect Framed-IP-Address in SSO packet.") + } + + if string(rfc2865.UserName_Get(p)) != sampleInfo["username"] { + t.Errorf("Incorrect User-Name in SSO packet.") + } + + if string(rfc2865.CallingStationID_Get(p)) != sampleInfo["mac"] { + t.Errorf("Incorrect Calling-Station-Id in SSO packet.") + } + + if string(rfc2865.FilterID_Get(p)) != sampleInfo["role"] { + t.Errorf("Incorrect Filter-Id in SSO packet.") + } +} + +func TestContentKeeperStopRadiusPacket(t *testing.T) { + f := WatchGuard{Password: "secret"} + + p := f.stopRadiusPacket(ctx, sampleInfo) + + if rfc2866.AcctStatusType_Get(p) != 2 { + t.Errorf("Incorrect Acct-Status-Type in SSO packet.") + } + + if rfc2865.FramedIPAddress_Get(p).String() != sampleInfo["ip"] { + t.Errorf("Incorrect Framed-IP-Address in SSO packet.") + } + + if string(rfc2865.UserName_Get(p)) != sampleInfo["username"] { + t.Errorf("Incorrect User-Name in SSO packet.") + } + + if string(rfc2865.CallingStationID_Get(p)) != sampleInfo["mac"] { + t.Errorf("Incorrect Calling-Station-Id in SSO packet.") + } + + if string(rfc2865.FilterID_Get(p)) != sampleInfo["role"] { + t.Errorf("Incorrect Filter-Id in SSO packet.") + } +} diff --git a/go/firewallsso/factory.go b/go/firewallsso/factory.go index 614a6b601dd5..839e68dd5f37 100644 --- a/go/firewallsso/factory.go +++ b/go/firewallsso/factory.go @@ -29,6 +29,7 @@ func NewFactory(ctx context.Context) Factory { f.typeRegistry["JuniperSRX"] = reflect.TypeOf(&JuniperSRX{}).Elem() f.typeRegistry["FamilyZone"] = reflect.TypeOf(&FamilyZone{}).Elem() f.typeRegistry["CiscoIsePic"] = reflect.TypeOf(&CiscoIsePic{}).Elem() + f.typeRegistry["ContentKeeper"] = reflect.TypeOf(&ContentKeeper{}).Elem() return f } diff --git a/go/go.mod b/go/go.mod index e5b383ce0492..bb75249dff5c 100644 --- a/go/go.mod +++ b/go/go.mod @@ -26,7 +26,7 @@ require ( github.com/gin-gonic/gin v1.7.0 github.com/go-acme/lego v2.5.0+incompatible github.com/go-errors/errors v1.0.1 - github.com/go-kit/kit v0.10.0 + github.com/go-kit/kit v0.10.0 // indirect github.com/go-redis/redis v0.0.0-20190325112110-a679e614427a github.com/go-sql-driver/mysql v1.6.0 github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d @@ -96,13 +96,14 @@ require ( k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 - k8s.io/klog v1.0.0 software.sslmate.com/src/go-pkcs12 v0.0.0-20190322163127-6e380ad96778 ) require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.3 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 + github.com/VividCortex/mysqlerr v1.0.0 + github.com/go-kit/log v0.2.1 ) require ( @@ -116,7 +117,6 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/VividCortex/mysqlerr v1.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect @@ -125,9 +125,8 @@ require ( github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dimchansky/utfbom v1.1.0 // indirect github.com/emicklei/go-restful/v3 v3.8.0 // indirect - github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-logfmt/logfmt v0.5.0 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect @@ -143,7 +142,6 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/googleapis/gax-go/v2 v2.1.0 // indirect - github.com/googleapis/gnostic v0.4.1 // indirect github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda // indirect github.com/inverse-inc/pkcs7 v0.0.0-20221012121123-778f83870ec7 // indirect github.com/jinzhu/inflection v1.0.0 // indirect @@ -167,11 +165,11 @@ require ( github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/procfs v0.2.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect github.com/tinylib/msgp v1.1.2 // indirect github.com/ugorji/go/codec v1.1.7 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -197,12 +195,10 @@ require ( github.com/go-redis/redis/v8 v8.11.5 github.com/golang/snappy v0.0.3 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/imdario/mergo v0.3.9 // indirect github.com/jpillora/ansi v1.0.2 // indirect github.com/naoina/go-stringutil v0.1.0 // indirect github.com/philhofer/fwd v1.0.0 // indirect github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect diff --git a/go/go.sum b/go/go.sum index e3068a28c369..2b422e67d7d7 100644 --- a/go/go.sum +++ b/go/go.sum @@ -6,11 +6,9 @@ cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0 h1:WRz29PgAsVEyPSDHyk+0fpEkwEFyfhHn+JbksT6gIL4= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= @@ -56,16 +54,9 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 h1:jp0dGvZ7ZK0mgqnTSClMxa5 github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= github.com/Azure/go-autorest/autorest v0.11.9/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest v0.11.10 h1:j5sGbX7uj1ieYYkQ3Mpvewd4DCsEQ+ZeJpqnSM9pjnM= -github.com/Azure/go-autorest/autorest v0.11.10/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= -github.com/Azure/go-autorest/autorest/adal v0.9.5 h1:Y3bBUV4rTuxenJJs41HU3qmqsb+auo+a3Lz+PlJPpL0= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= @@ -74,24 +65,16 @@ github.com/Azure/go-autorest/autorest/azure/auth v0.5.3 h1:lZifaPRAk1bqg5vGqreL6 github.com/Azure/go-autorest/autorest/azure/auth v0.5.3/go.mod h1:4bJZhUhcq8LB20TruwHbAQsmUs2Xh+QR7utuJpLXX3A= github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 h1:dMOmEJfkLKW/7JsokJqkyoYSgmR08hi9KrhjZb+JALY= github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= -github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.2.0 h1:nQOZzFCudTh+TvquAtCRjM01VEYx85e9qbwt5ncW4L8= github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 h1:BWe8a+f/t+7KY7zH2mqygeUD0t8hNFXe08p1Pb3/jKE= @@ -104,15 +87,15 @@ github.com/DataDog/datadog-go v3.5.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.7 h1:fzrmmkskv067ZQbd9wERNGuxckWw67dyzoMG62p7LMo= +github.com/OneOfOne/xxhash v1.2.7 h1:fzrmmkskv067ZQbd9wERNGuxckWw67dyzoMG62p7LMo= +github.com/OneOfOne/xxhash v1.2.7/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/OneOfOne/xxhash v1.2.7/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Sereal/Sereal v0.0.0-20200729022450-08708a3c86f3 h1:HR0nkgfo+bL+bOpG/zzwE0arh4E0EXkvkRxYku0R90Y= @@ -206,15 +189,12 @@ github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQ github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c= github.com/dnstap/golang-dnstap v0.2.2 h1:H2PCf5R92SRSsXuSM9P4ToqRkzaRLwtS8UPwauHLPf8= github.com/dnstap/golang-dnstap v0.2.2/go.mod h1:JIH+8jjV4pSEZCGPfPgFfuwyzmAuTLrEnk0BxtrF/5w= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= @@ -228,7 +208,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/farsightsec/golang-framestream v0.2.0/go.mod h1:eNde4IQyEiA5br02AouhEHCu3p3UzrCdFR4LuQHklMI= github.com/farsightsec/golang-framestream v0.3.0 h1:/spFQHucTle/ZIPkYqrfshQqPe2VQEzesH243TjIwqA= github.com/farsightsec/golang-framestream v0.3.0/go.mod h1:eNde4IQyEiA5br02AouhEHCu3p3UzrCdFR4LuQHklMI= @@ -239,7 +218,6 @@ github.com/fdurand/go-cache v0.0.0-20180104143916-cf0198ac7d92 h1:sCTZC7Lf2vXjtJ github.com/fdurand/go-cache v0.0.0-20180104143916-cf0198ac7d92/go.mod h1:v+JY1cLdRxXdjkw/PMyO810oIdqhpXxnOBf8xxWyewQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= @@ -248,7 +226,6 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gdey/jsonpath v0.0.0-20151203210429-124c978a1ffc h1:jemsp2ZuVhLA7YaPfJjxj0aVU4FtINBmZr3gf7YEz7c= github.com/gdey/jsonpath v0.0.0-20151203210429-124c978a1ffc/go.mod h1:fbW+bY2drdcVbf6imfca7jO1O83prE9MrbYJ8vtlq0A= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -266,25 +243,22 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= @@ -314,8 +288,6 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d h1:lBXNCxVENCipq4D1Is42JVOP4eQjlB8TQ6H69Yx5J9Q= @@ -331,7 +303,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -340,10 +311,10 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -364,8 +335,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -382,7 +351,6 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= @@ -410,17 +378,13 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0 h1:6DWmvNpomjL1+3liNSZbVns3zsYzzCjm6pRBO1tLeso= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -435,7 +399,6 @@ github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlI github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda h1:5ikpG9mYCMFiZX0nkxoV6aU2IpCHPdws3gCNgdZeEV0= github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda/go.mod h1:MyndkAZd5rUMdNogn35MWXBX1UiBigrU8eTj8DoAC2c= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -473,9 +436,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= -github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/log15 v0.0.0-20171019012758-0decfc6c20d9 h1:LmBUkXNSSmEV5hExb65hKje7sDuuDug3xsPAba7x5fw= github.com/inconshreveable/log15 v0.0.0-20171019012758-0decfc6c20d9/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -526,7 +486,6 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -539,7 +498,6 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/julsemaan/certmagic v0.6.3-0.20191015203349-067e102ae4ff h1:w0Qihh9m1pTiC6UwwnRLI6b1hn07rjfM6D6kJIVYmmU= github.com/julsemaan/certmagic v0.6.3-0.20191015203349-067e102ae4ff/go.mod h1:dLn2sf7w2v1/S9MzxcjEB0hd7z7Nmy6RKTO78AeB+xI= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= @@ -555,7 +513,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= @@ -575,7 +532,6 @@ github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H7 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced h1:zqEC1GJZFbGZA0tRyNZqRjep92K5fujFtFsu5ZW7Aug= github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= @@ -619,17 +575,14 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8= @@ -641,6 +594,7 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= @@ -649,17 +603,14 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= @@ -680,7 +631,6 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= @@ -751,10 +701,8 @@ github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c h1:gqEdF4VwBu3lTKGH github.com/sparrc/go-ping v0.0.0-20190613174326-4e5b6552494c/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -767,7 +715,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/ti-mo/netfilter v0.2.0 h1:mMZ70vvHTlY9y8ElWflp5nVN5kkUDvm6D1JXRgartKI= github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= @@ -793,7 +741,6 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= @@ -818,7 +765,6 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -915,7 +861,6 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -983,7 +928,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1028,15 +972,12 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1114,7 +1055,6 @@ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= @@ -1135,7 +1075,6 @@ google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= @@ -1166,7 +1105,6 @@ google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1213,7 +1151,6 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= @@ -1258,8 +1195,8 @@ gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzyc gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -1293,7 +1230,6 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1304,40 +1240,27 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= -k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= -k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc= -k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/html/captive-portal/lib/captiveportal.pm b/html/captive-portal/lib/captiveportal.pm index 75f1e0be795b..0296c20b8201 100644 --- a/html/captive-portal/lib/captiveportal.pm +++ b/html/captive-portal/lib/captiveportal.pm @@ -286,7 +286,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Base/Actions.pm b/html/captive-portal/lib/captiveportal/Base/Actions.pm index c523d6203829..bb313232d772 100644 --- a/html/captive-portal/lib/captiveportal/Base/Actions.pm +++ b/html/captive-portal/lib/captiveportal/Base/Actions.pm @@ -103,7 +103,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Base/Controller.pm b/html/captive-portal/lib/captiveportal/Base/Controller.pm index 58b8025a3662..031f56dc2278 100644 --- a/html/captive-portal/lib/captiveportal/Base/Controller.pm +++ b/html/captive-portal/lib/captiveportal/Base/Controller.pm @@ -66,7 +66,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Base/I18N.pm b/html/captive-portal/lib/captiveportal/Base/I18N.pm index 261e4ddc1ad7..ec9d602de08c 100644 --- a/html/captive-portal/lib/captiveportal/Base/I18N.pm +++ b/html/captive-portal/lib/captiveportal/Base/I18N.pm @@ -41,7 +41,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Activate/Email.pm b/html/captive-portal/lib/captiveportal/Controller/Activate/Email.pm index 3cb2331a2d59..36e5600c18b1 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Activate/Email.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Activate/Email.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Authenticate.pm b/html/captive-portal/lib/captiveportal/Controller/Authenticate.pm index 96b869698f83..7e2bfca87242 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Authenticate.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Authenticate.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/DeviceRegistration.pm b/html/captive-portal/lib/captiveportal/Controller/DeviceRegistration.pm index 4955c14dadfc..a16efb22eedd 100644 --- a/html/captive-portal/lib/captiveportal/Controller/DeviceRegistration.pm +++ b/html/captive-portal/lib/captiveportal/Controller/DeviceRegistration.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Enabler.pm b/html/captive-portal/lib/captiveportal/Controller/Enabler.pm index 43148681afe9..0f197178cd77 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Enabler.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Enabler.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/LostStolen.pm b/html/captive-portal/lib/captiveportal/Controller/LostStolen.pm index 382ee5c2271c..14941fad848f 100644 --- a/html/captive-portal/lib/captiveportal/Controller/LostStolen.pm +++ b/html/captive-portal/lib/captiveportal/Controller/LostStolen.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/NetworkLogoff.pm b/html/captive-portal/lib/captiveportal/Controller/NetworkLogoff.pm index d93eca33da3e..7205bd573c89 100644 --- a/html/captive-portal/lib/captiveportal/Controller/NetworkLogoff.pm +++ b/html/captive-portal/lib/captiveportal/Controller/NetworkLogoff.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Node/Manager.pm b/html/captive-portal/lib/captiveportal/Controller/Node/Manager.pm index 2afe673eb48d..9cac5e66fb0b 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Node/Manager.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Node/Manager.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/PortalToken.pm b/html/captive-portal/lib/captiveportal/Controller/PortalToken.pm index b39263b932e1..9c1270d91cc2 100644 --- a/html/captive-portal/lib/captiveportal/Controller/PortalToken.pm +++ b/html/captive-portal/lib/captiveportal/Controller/PortalToken.pm @@ -20,7 +20,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Redirect.pm b/html/captive-portal/lib/captiveportal/Controller/Redirect.pm index e4a34772fee1..cf50e8a55f1d 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Redirect.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Redirect.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Remediation.pm b/html/captive-portal/lib/captiveportal/Controller/Remediation.pm index f07a6a32935f..f6d73e05ae2d 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Remediation.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Remediation.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Root.pm b/html/captive-portal/lib/captiveportal/Controller/Root.pm index a564f95c88f8..644b5f0a3a16 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Root.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Root.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/SecurityEvent.pm b/html/captive-portal/lib/captiveportal/Controller/SecurityEvent.pm index 5fc39ca7a00c..b6f3f55838fc 100644 --- a/html/captive-portal/lib/captiveportal/Controller/SecurityEvent.pm +++ b/html/captive-portal/lib/captiveportal/Controller/SecurityEvent.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/Status.pm b/html/captive-portal/lib/captiveportal/Controller/Status.pm index 57453e171a14..690e818bfe8e 100644 --- a/html/captive-portal/lib/captiveportal/Controller/Status.pm +++ b/html/captive-portal/lib/captiveportal/Controller/Status.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/StripeCustomerPortal.pm b/html/captive-portal/lib/captiveportal/Controller/StripeCustomerPortal.pm index 587f84502c71..f8e5abd846bb 100644 --- a/html/captive-portal/lib/captiveportal/Controller/StripeCustomerPortal.pm +++ b/html/captive-portal/lib/captiveportal/Controller/StripeCustomerPortal.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Controller/WirelessProfile.pm b/html/captive-portal/lib/captiveportal/Controller/WirelessProfile.pm index 99162f37c1d4..2bade43ebdfa 100644 --- a/html/captive-portal/lib/captiveportal/Controller/WirelessProfile.pm +++ b/html/captive-portal/lib/captiveportal/Controller/WirelessProfile.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Application.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Application.pm index 07429bfe187e..b8ec7a9b2a3d 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Application.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Application.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Detach.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Detach.pm index 50d406376b34..693f3c2e03d1 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Detach.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Detach.pm @@ -18,7 +18,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Factory.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Factory.pm index 037276e55b20..9578cb3573a0 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Factory.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Factory.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module.pm index 224f3e28c6ed..4ec997321bd8 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication.pm index 9a8787153500..a38330b6d4c3 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Billing.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Billing.pm index 43c8893d7b5e..13d19d679bc4 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Billing.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Billing.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Blackhole.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Blackhole.pm index 7349611d1d06..d783d00793c9 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Blackhole.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Blackhole.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Choice.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Choice.pm index 542050726f1c..a826252fa569 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Choice.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Choice.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Email.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Email.pm index b1776d27b69d..84fdf360fdae 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Email.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Email.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Login.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Login.pm index febd2a43c18a..537efb44916a 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Login.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Login.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Null.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Null.pm index 3860115c6358..490b86497512 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Null.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Null.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth.pm index f598d64d5fef..e8929dea3ad5 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Facebook.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Facebook.pm index 0c22f37a55d0..d5a2b26d2e23 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Facebook.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Facebook.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Github.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Github.pm index 6a335c6ab835..ff44779597ba 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Github.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Github.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Google.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Google.pm index 1cbcde98b9cf..46204f1e2081 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Google.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/Google.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm index 67b14b12a34b..bcfc525d391b 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/OpenID.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/OpenID.pm index ac0b1416bd13..fff23322ef06 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/OpenID.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/OpenID.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm index ad589843d457..6934a993ad48 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Password.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Password.pm index 4604423a0f71..1ee868165638 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Password.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Password.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SAML.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SAML.pm index 0dd353877d1d..b9e6e7528d9d 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SAML.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SAML.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SMS.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SMS.pm index 781eb52a88b8..4d846d2c0959 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SMS.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/SMS.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Sponsor.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Sponsor.pm index 045bade2f5da..f6df13b8984c 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Sponsor.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Authentication/Sponsor.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Chained.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Chained.pm index dd70f7d239ce..742f91f08ef0 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Chained.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Chained.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Choice.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Choice.pm index 436f767493c2..df17bb55ec21 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Choice.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Choice.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/FixedRole.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/FixedRole.pm index 706e38f3f07b..bf5db87289b1 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/FixedRole.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/FixedRole.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/MFA.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/MFA.pm index 0629a2f8ad6d..d0b5b7bfec9c 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/MFA.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/MFA.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Message.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Message.pm index 59ad86ab6ac0..e05fb4c7d337 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Message.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Message.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Provisioning.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Provisioning.pm index 9cb5f5905cb9..5bb647c7f462 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Provisioning.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Provisioning.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Root.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Root.pm index 889b7f20d92e..b4b893660a5d 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Root.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Root.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/RootSSO.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/RootSSO.pm index bab20a8cea74..db2b7afb9f36 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/RootSSO.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/RootSSO.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SSL_Inspection.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SSL_Inspection.pm index 6b678507513e..4a4e5a5eb318 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SSL_Inspection.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SSL_Inspection.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SelectRole.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SelectRole.pm index b48955e1acf6..08b17175b31b 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SelectRole.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/SelectRole.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/ShowLocalAccount.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/ShowLocalAccount.pm index 83db01a253de..5e1b81443126 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/ShowLocalAccount.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/ShowLocalAccount.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Survey.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Survey.pm index b38bdfc7f449..e3c73950b90a 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Survey.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/Survey.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/TLSEnrollment.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/TLSEnrollment.pm index 7a9bfb9fecdb..d8d3c58550d0 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/TLSEnrollment.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/TLSEnrollment.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/URL.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/URL.pm index e9235808c56b..bd2ce84f99a3 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/Module/URL.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/Module/URL.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/DynamicRouting/ModuleManager.pm b/html/captive-portal/lib/captiveportal/DynamicRouting/ModuleManager.pm index 8fb6373a3f5f..43a0301d1315 100644 --- a/html/captive-portal/lib/captiveportal/DynamicRouting/ModuleManager.pm +++ b/html/captive-portal/lib/captiveportal/DynamicRouting/ModuleManager.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Form/Authentication.pm b/html/captive-portal/lib/captiveportal/Form/Authentication.pm index b16d319607d8..f990445727cf 100644 --- a/html/captive-portal/lib/captiveportal/Form/Authentication.pm +++ b/html/captive-portal/lib/captiveportal/Form/Authentication.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Form/Field/AUP.pm b/html/captive-portal/lib/captiveportal/Form/Field/AUP.pm index 43895a72f0be..272d05d975fa 100644 --- a/html/captive-portal/lib/captiveportal/Form/Field/AUP.pm +++ b/html/captive-portal/lib/captiveportal/Form/Field/AUP.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Form/Survey.pm b/html/captive-portal/lib/captiveportal/Form/Survey.pm index 8b96eeadd4e9..7de6026ae9fc 100644 --- a/html/captive-portal/lib/captiveportal/Form/Survey.pm +++ b/html/captive-portal/lib/captiveportal/Form/Survey.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Form/Widget/Field/AUP.pm b/html/captive-portal/lib/captiveportal/Form/Widget/Field/AUP.pm index 7ff6d882949c..dfc872c798eb 100644 --- a/html/captive-portal/lib/captiveportal/Form/Widget/Field/AUP.pm +++ b/html/captive-portal/lib/captiveportal/Form/Widget/Field/AUP.pm @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Model/Portal/Session.pm b/html/captive-portal/lib/captiveportal/Model/Portal/Session.pm index 8bba3fd4ba90..23203df91c7e 100644 --- a/html/captive-portal/lib/captiveportal/Model/Portal/Session.pm +++ b/html/captive-portal/lib/captiveportal/Model/Portal/Session.pm @@ -17,7 +17,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Email.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Email.pm index aa328f5bf01e..864c1785940a 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Email.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Activate/Email.pm @@ -291,7 +291,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Authenticate.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Authenticate.pm index 892ca4a6e708..418707edda92 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Authenticate.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Authenticate.pm @@ -187,7 +187,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/DeviceRegistration.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/DeviceRegistration.pm index 9df4d28f74c3..efde506c6322 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/DeviceRegistration.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/DeviceRegistration.pm @@ -282,7 +282,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Enabler.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Enabler.pm index 5cb0aad122ee..b1ccb29d16df 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Enabler.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Enabler.pm @@ -54,7 +54,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/LostStolen.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/LostStolen.pm index 566dbc628349..57fed3dbca6d 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/LostStolen.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/LostStolen.pm @@ -61,7 +61,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/NetworkLogoff.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/NetworkLogoff.pm index 7cfe27c1afad..c13b78fdaf23 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/NetworkLogoff.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/NetworkLogoff.pm @@ -59,7 +59,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Node/Manager.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Node/Manager.pm index e33d865c4993..0343a3d0dd7f 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Node/Manager.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Node/Manager.pm @@ -69,7 +69,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/PortalToken.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/PortalToken.pm index 1171cf9affa8..8dad4e6ab714 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/PortalToken.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/PortalToken.pm @@ -51,7 +51,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Redirect.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Redirect.pm index 87d2188710b6..9b5e9959226f 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Redirect.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Redirect.pm @@ -33,7 +33,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Remediation.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Remediation.pm index 3dfe9e6104eb..7348d58a283e 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Remediation.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Remediation.pm @@ -104,7 +104,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Root.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Root.pm index 57b5261ba089..6cc677fdd6e4 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Root.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Root.pm @@ -376,7 +376,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/SecurityEvent.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/SecurityEvent.pm index 80b0203d7d62..ed473f5cebc5 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/SecurityEvent.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/SecurityEvent.pm @@ -150,7 +150,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Status.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Status.pm index bc3f8ff9c4a3..9059d75bbe86 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/Status.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/Status.pm @@ -241,7 +241,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/StripeCustomerPortal.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/StripeCustomerPortal.pm index d880be876214..20c31d8f039a 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/StripeCustomerPortal.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/StripeCustomerPortal.pm @@ -91,7 +91,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Controller/WirelessProfile.pm b/html/captive-portal/lib/captiveportal/PacketFence/Controller/WirelessProfile.pm index 68b2d67791a8..eea3a3102836 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Controller/WirelessProfile.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Controller/WirelessProfile.pm @@ -79,7 +79,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Application.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Application.pm index 375884e5a911..a6c284a3a8f7 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Application.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Application.pm @@ -389,6 +389,10 @@ sub render { %saved_fields, }; + if(isenabled($Config{captive_portal}{expose_fingerbank_info_all_templates})) { + $layout_args->{fingerbank_info} = pf::node::fingerbank_info($self->current_mac, $self->root_module->node_info); + } + $args->{layout} //= $TRUE; $args->{raw} //= $FALSE; if($args->{raw}){ @@ -602,7 +606,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Factory.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Factory.pm index f19b82771a3e..f13c4cba268e 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Factory.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Factory.pm @@ -228,7 +228,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module.pm index f8d4cc00b294..32a062ff58c1 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module.pm @@ -382,7 +382,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication.pm index aedb4133ceb2..97b87462c15a 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication.pm @@ -410,7 +410,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Billing.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Billing.pm index 4ca343e4cdc0..c0e3bedfdf35 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Billing.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Billing.pm @@ -392,7 +392,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Blackhole.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Blackhole.pm index efeb7a528801..2288098457b9 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Blackhole.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Blackhole.pm @@ -39,7 +39,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Choice.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Choice.pm index 70c13d805f9c..7101a827f220 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Choice.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Choice.pm @@ -82,7 +82,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Email.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Email.pm index 16b578a4b9ce..7a053f5d346e 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Email.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Email.pm @@ -177,7 +177,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Login.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Login.pm index 16d81b4dac2d..a766a34100fe 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Login.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Login.pm @@ -320,7 +320,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Null.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Null.pm index acf220e4f1a4..8a12ce707ba2 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Null.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Null.pm @@ -104,7 +104,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth.pm index 4f7e6666e5e9..634f76aa06a4 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth.pm @@ -233,7 +233,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Facebook.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Facebook.pm index 2602ea6c8050..68f0c4f903a9 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Facebook.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Facebook.pm @@ -21,7 +21,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Github.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Github.pm index 450b7d9ee491..1b200a4c4758 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Github.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Github.pm @@ -34,7 +34,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Google.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Google.pm index c8459b90a2d8..a74c86feedd0 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Google.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/Google.pm @@ -21,7 +21,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm index 150a9ae7d2d2..0ab66131ba75 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/LinkedIn.pm @@ -37,7 +37,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/OpenID.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/OpenID.pm index 0d70f8f4d55d..faddbb2ca27c 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/OpenID.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/OpenID.pm @@ -47,7 +47,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm index 5beb22a99913..1566b8d30ee4 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/OAuth/WindowsLive.pm @@ -34,7 +34,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Password.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Password.pm index 1a8d63ace632..0d38e02a3fbd 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Password.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Password.pm @@ -67,7 +67,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SAML.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SAML.pm index 7bad7d73d26a..0f03956caf44 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SAML.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SAML.pm @@ -114,7 +114,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SMS.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SMS.pm index e1b9cf4ff1a7..95db5f47f5f5 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SMS.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/SMS.pm @@ -334,7 +334,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Sponsor.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Sponsor.pm index 4611b046bac9..9f99e3ac3d8c 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Sponsor.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Authentication/Sponsor.pm @@ -314,7 +314,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Chained.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Chained.pm index f45f9c63566a..dea72d3483f5 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Chained.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Chained.pm @@ -65,7 +65,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Choice.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Choice.pm index 3a57f703e7f5..59b5bf32ca84 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Choice.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Choice.pm @@ -127,7 +127,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/FixedRole.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/FixedRole.pm index 7b4e7c210b06..d14daa7b2f32 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/FixedRole.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/FixedRole.pm @@ -42,7 +42,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/MFA.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/MFA.pm index b1e197f19d86..1b4b1b469a47 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/MFA.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/MFA.pm @@ -128,7 +128,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Message.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Message.pm index 8f3cc1de90b6..e7c29dae7c90 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Message.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Message.pm @@ -48,7 +48,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Provisioning.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Provisioning.pm index 2d60fa88211c..d3f848cc9df1 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Provisioning.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Provisioning.pm @@ -163,7 +163,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Root.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Root.pm index de9cd7303e1e..184e2766fdbe 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Root.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Root.pm @@ -380,7 +380,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/RootSSO.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/RootSSO.pm index 122d11010034..59b26ae0988b 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/RootSSO.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/RootSSO.pm @@ -112,7 +112,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SSL_Inspection.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SSL_Inspection.pm index bb0de8fd7301..2ef5965ae5f3 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SSL_Inspection.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SSL_Inspection.pm @@ -191,7 +191,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SelectRole.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SelectRole.pm index 15ab5c17ffdb..a708886149e6 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SelectRole.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/SelectRole.pm @@ -55,7 +55,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/ShowLocalAccount.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/ShowLocalAccount.pm index 61568d2f9d9b..e4e061cb6834 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/ShowLocalAccount.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/ShowLocalAccount.pm @@ -45,7 +45,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Survey.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Survey.pm index 9cac834bdbce..5e01f9feb249 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Survey.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/Survey.pm @@ -172,7 +172,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/TLSEnrollment.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/TLSEnrollment.pm index f9b10c59b014..89998fe27525 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/TLSEnrollment.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/TLSEnrollment.pm @@ -246,7 +246,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/URL.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/URL.pm index 67cf1880e481..a4e299097007 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/URL.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/Module/URL.pm @@ -39,7 +39,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/ModuleManager.pm b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/ModuleManager.pm index 1548b5938dc5..a953819546e8 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/ModuleManager.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/DynamicRouting/ModuleManager.pm @@ -188,7 +188,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Form/Authentication.pm b/html/captive-portal/lib/captiveportal/PacketFence/Form/Authentication.pm index a2eeb5a31534..036522b0e7da 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Form/Authentication.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Form/Authentication.pm @@ -185,7 +185,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Form/Field/AUP.pm b/html/captive-portal/lib/captiveportal/PacketFence/Form/Field/AUP.pm index ee411a90ff00..1ed6b292de3d 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Form/Field/AUP.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Form/Field/AUP.pm @@ -31,7 +31,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Form/Survey.pm b/html/captive-portal/lib/captiveportal/PacketFence/Form/Survey.pm index 6206f27f46d6..8d236e6504a7 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Form/Survey.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Form/Survey.pm @@ -89,7 +89,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Form/Widget/Field/AUP.pm b/html/captive-portal/lib/captiveportal/PacketFence/Form/Widget/Field/AUP.pm index a0f5b79a9575..ad099d038bde 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Form/Widget/Field/AUP.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Form/Widget/Field/AUP.pm @@ -49,7 +49,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/Model/Portal/Session.pm b/html/captive-portal/lib/captiveportal/PacketFence/Model/Portal/Session.pm index 612cc1d7b4fe..521a4d8b5ef5 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/Model/Portal/Session.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/Model/Portal/Session.pm @@ -43,7 +43,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/View/HTML.pm b/html/captive-portal/lib/captiveportal/PacketFence/View/HTML.pm index cb67c22277e7..dea533dd1fa0 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/View/HTML.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/View/HTML.pm @@ -38,7 +38,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/View/JSON.pm b/html/captive-portal/lib/captiveportal/PacketFence/View/JSON.pm index e920534256fa..96da2158bcaa 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/View/JSON.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/View/JSON.pm @@ -33,7 +33,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/PacketFence/View/MobileConfig.pm b/html/captive-portal/lib/captiveportal/PacketFence/View/MobileConfig.pm index 9c94747350bc..fbc5b60162df 100644 --- a/html/captive-portal/lib/captiveportal/PacketFence/View/MobileConfig.pm +++ b/html/captive-portal/lib/captiveportal/PacketFence/View/MobileConfig.pm @@ -45,7 +45,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Role/Action/Hookable.pm b/html/captive-portal/lib/captiveportal/Role/Action/Hookable.pm index 1beb68cde836..229b705c51fd 100644 --- a/html/captive-portal/lib/captiveportal/Role/Action/Hookable.pm +++ b/html/captive-portal/lib/captiveportal/Role/Action/Hookable.pm @@ -53,7 +53,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Role/FieldValidation.pm b/html/captive-portal/lib/captiveportal/Role/FieldValidation.pm index 384f8db03d11..1644538366e0 100644 --- a/html/captive-portal/lib/captiveportal/Role/FieldValidation.pm +++ b/html/captive-portal/lib/captiveportal/Role/FieldValidation.pm @@ -115,7 +115,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Role/MultiSource.pm b/html/captive-portal/lib/captiveportal/Role/MultiSource.pm index 83273b23f2a3..399fa437420b 100644 --- a/html/captive-portal/lib/captiveportal/Role/MultiSource.pm +++ b/html/captive-portal/lib/captiveportal/Role/MultiSource.pm @@ -125,7 +125,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Role/Request.pm b/html/captive-portal/lib/captiveportal/Role/Request.pm index df22900882f3..f4154eb63808 100644 --- a/html/captive-portal/lib/captiveportal/Role/Request.pm +++ b/html/captive-portal/lib/captiveportal/Role/Request.pm @@ -71,7 +71,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/Role/Routed.pm b/html/captive-portal/lib/captiveportal/Role/Routed.pm index ccb55cc87b89..b7b9271661b8 100644 --- a/html/captive-portal/lib/captiveportal/Role/Routed.pm +++ b/html/captive-portal/lib/captiveportal/Role/Routed.pm @@ -58,7 +58,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/View/HTML.pm b/html/captive-portal/lib/captiveportal/View/HTML.pm index a1936e255eee..32d40dc295a8 100644 --- a/html/captive-portal/lib/captiveportal/View/HTML.pm +++ b/html/captive-portal/lib/captiveportal/View/HTML.pm @@ -23,7 +23,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/View/JSON.pm b/html/captive-portal/lib/captiveportal/View/JSON.pm index fc94a1c83361..5e58a58aa175 100644 --- a/html/captive-portal/lib/captiveportal/View/JSON.pm +++ b/html/captive-portal/lib/captiveportal/View/JSON.pm @@ -23,7 +23,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/View/MobileConfig.pm b/html/captive-portal/lib/captiveportal/View/MobileConfig.pm index 2a44627bf66e..8ad0172b1067 100644 --- a/html/captive-portal/lib/captiveportal/View/MobileConfig.pm +++ b/html/captive-portal/lib/captiveportal/View/MobileConfig.pm @@ -23,7 +23,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/lib/captiveportal/util.pm b/html/captive-portal/lib/captiveportal/util.pm index 7859bf794b60..41e1a60f376d 100644 --- a/html/captive-portal/lib/captiveportal/util.pm +++ b/html/captive-portal/lib/captiveportal/util.pm @@ -140,7 +140,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/t/01app.t b/html/captive-portal/t/01app.t index 25a32fd22026..edb9f2f70457 100644 --- a/html/captive-portal/t/01app.t +++ b/html/captive-portal/t/01app.t @@ -15,7 +15,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/t/02pod.t b/html/captive-portal/t/02pod.t index d7a851c418df..1b50d63e0ec1 100644 --- a/html/captive-portal/t/02pod.t +++ b/html/captive-portal/t/02pod.t @@ -15,7 +15,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/t/03podcoverage.t b/html/captive-portal/t/03podcoverage.t index c11256e1da29..984e879f5f8a 100644 --- a/html/captive-portal/t/03podcoverage.t +++ b/html/captive-portal/t/03podcoverage.t @@ -19,7 +19,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/t/view_HTML.t b/html/captive-portal/t/view_HTML.t index ca5b298667b5..6c3d5dabf7fb 100644 --- a/html/captive-portal/t/view_HTML.t +++ b/html/captive-portal/t/view_HTML.t @@ -13,7 +13,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/captive-portal/templates/wireless-profile-noeap.xml b/html/captive-portal/templates/wireless-profile-noeap.xml index 50d902bf4eed..1a55031a0a3f 100644 --- a/html/captive-portal/templates/wireless-profile-noeap.xml +++ b/html/captive-portal/templates/wireless-profile-noeap.xml @@ -9,7 +9,11 @@ AutoJoin EncryptionType + [% IF for_ios AND provisioner.security_type == 'WPA' %] + WPA2 + [% ELSE %] [% provisioner.security_type %] + [% END %] HIDDEN_NETWORK [% IF provisioner.broadcast %] diff --git a/html/captive-portal/templates/wireless-profile-peap.xml b/html/captive-portal/templates/wireless-profile-peap.xml index 245e8b67a120..4ec45b09cfd0 100644 --- a/html/captive-portal/templates/wireless-profile-peap.xml +++ b/html/captive-portal/templates/wireless-profile-peap.xml @@ -28,7 +28,11 @@ [% username %] EncryptionType + [% IF for_ios AND provisioner.security_type == 'WPA' %] + WPA2 + [% ELSE %] [% provisioner.security_type %] + [% END %] HIDDEN_NETWORK [% IF provisioner.broadcast %] diff --git a/html/captive-portal/templates/wireless-profile-tls.xml b/html/captive-portal/templates/wireless-profile-tls.xml index 814c41730ea0..c20180c57762 100644 --- a/html/captive-portal/templates/wireless-profile-tls.xml +++ b/html/captive-portal/templates/wireless-profile-tls.xml @@ -14,9 +14,17 @@ [% provisioner.eap_type %] + PayloadCertificateAnchorUUID + + c83817c4-d7c4-11e4-b9d6-1681e6b88ec1 + EncryptionType + [% IF for_ios AND provisioner.security_type == 'WPA' %] + WPA2 + [% ELSE %] [% provisioner.security_type %] + [% END %] HIDDEN_NETWORK [% IF provisioner.broadcast %] diff --git a/html/pfappserver/lib/pfappserver/Base/Action/AdminRole.pm b/html/pfappserver/lib/pfappserver/Base/Action/AdminRole.pm index 27bed9cacb17..c21a3c4800d8 100644 --- a/html/pfappserver/lib/pfappserver/Base/Action/AdminRole.pm +++ b/html/pfappserver/lib/pfappserver/Base/Action/AdminRole.pm @@ -54,7 +54,7 @@ before execute => sub { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Action/SimpleSearch.pm b/html/pfappserver/lib/pfappserver/Base/Action/SimpleSearch.pm index 87faa346cb99..db1c61875300 100644 --- a/html/pfappserver/lib/pfappserver/Base/Action/SimpleSearch.pm +++ b/html/pfappserver/lib/pfappserver/Base/Action/SimpleSearch.pm @@ -33,7 +33,7 @@ after execute => sub { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form.pm b/html/pfappserver/lib/pfappserver/Base/Form.pm index b956fa133fdf..625e785e0f94 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form.pm @@ -193,7 +193,7 @@ sub id_pattern { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Authentication/Action.pm b/html/pfappserver/lib/pfappserver/Base/Form/Authentication/Action.pm index 4dca47ae762f..6f2cf1db4eac 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Authentication/Action.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Authentication/Action.pm @@ -342,7 +342,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/PortalModule/ModuleManager.pm b/html/pfappserver/lib/pfappserver/Base/Form/PortalModule/ModuleManager.pm index c43506e3fce2..8b3195a3d2d9 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/PortalModule/ModuleManager.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/PortalModule/ModuleManager.pm @@ -96,7 +96,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/AllowedOptions.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/AllowedOptions.pm index 8ebf877d6866..7bd751b93f54 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/AllowedOptions.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/AllowedOptions.pm @@ -74,7 +74,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/Defaults.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/Defaults.pm index def21d1f6c2a..de3e484671e8 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/Defaults.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/Defaults.pm @@ -35,7 +35,7 @@ sub defaults_list { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/EmailFiltering.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/EmailFiltering.pm index e261b3cc4829..8f503c54e6b9 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/EmailFiltering.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/EmailFiltering.pm @@ -52,7 +52,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/Help.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/Help.pm index 84b95de13542..8f780a1e6101 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/Help.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/Help.pm @@ -42,7 +42,7 @@ sub help_list { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/InternalSource.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/InternalSource.pm index 682350145872..d4072296d16f 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/InternalSource.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/InternalSource.pm @@ -55,7 +55,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/MultiSource.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/MultiSource.pm index c782cc3fec0a..dd99b5f63b4b 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/MultiSource.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/MultiSource.pm @@ -54,7 +54,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/NoRules.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/NoRules.pm index 6365d9d79d69..73e8af00aeb1 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/NoRules.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/NoRules.pm @@ -30,7 +30,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/PasswordLength.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/PasswordLength.pm index 8fcf8a4e4f8c..f51cafdbd469 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/PasswordLength.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/PasswordLength.pm @@ -40,7 +40,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/PfdetectRateLimit.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/PfdetectRateLimit.pm index 6f48c6b0582d..9f2f5bf594f7 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/PfdetectRateLimit.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/PfdetectRateLimit.pm @@ -41,7 +41,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/SourceLocalAccount.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/SourceLocalAccount.pm index 59dc58af2015..3ad79b125642 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/SourceLocalAccount.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/SourceLocalAccount.pm @@ -99,7 +99,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/SourcesAssociated.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/SourcesAssociated.pm index 1dbac2e4b182..1bc776509e2e 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/SourcesAssociated.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/SourcesAssociated.pm @@ -53,7 +53,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/WithCustomFields.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/WithCustomFields.pm index 4c1a5c24d0ca..6d6dc3deac12 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/WithCustomFields.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/WithCustomFields.pm @@ -52,7 +52,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Form/Role/WithSource.pm b/html/pfappserver/lib/pfappserver/Base/Form/Role/WithSource.pm index 2d33c07f157e..cfd0c178094e 100644 --- a/html/pfappserver/lib/pfappserver/Base/Form/Role/WithSource.pm +++ b/html/pfappserver/lib/pfappserver/Base/Form/Role/WithSource.pm @@ -114,7 +114,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Model.pm b/html/pfappserver/lib/pfappserver/Base/Model.pm index 86f218bc9e7f..6d05f632149c 100644 --- a/html/pfappserver/lib/pfappserver/Base/Model.pm +++ b/html/pfappserver/lib/pfappserver/Base/Model.pm @@ -57,7 +57,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Model/Config.pm b/html/pfappserver/lib/pfappserver/Base/Model/Config.pm index 908977b8f9de..a4ec46987d24 100644 --- a/html/pfappserver/lib/pfappserver/Base/Model/Config.pm +++ b/html/pfappserver/lib/pfappserver/Base/Model/Config.pm @@ -340,7 +340,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Model/DB.pm b/html/pfappserver/lib/pfappserver/Base/Model/DB.pm index cb8086ffbdbb..ab430b7cf36b 100644 --- a/html/pfappserver/lib/pfappserver/Base/Model/DB.pm +++ b/html/pfappserver/lib/pfappserver/Base/Model/DB.pm @@ -319,7 +319,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Model/Fingerbank.pm b/html/pfappserver/lib/pfappserver/Base/Model/Fingerbank.pm index a774c48dfb82..316616abb8c8 100644 --- a/html/pfappserver/lib/pfappserver/Base/Model/Fingerbank.pm +++ b/html/pfappserver/lib/pfappserver/Base/Model/Fingerbank.pm @@ -287,7 +287,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Model/Node/Tab.pm b/html/pfappserver/lib/pfappserver/Base/Model/Node/Tab.pm index d6c748312933..d8e6979997a2 100644 --- a/html/pfappserver/lib/pfappserver/Base/Model/Node/Tab.pm +++ b/html/pfappserver/lib/pfappserver/Base/Model/Node/Tab.pm @@ -32,7 +32,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Base/Model/Search.pm b/html/pfappserver/lib/pfappserver/Base/Model/Search.pm index 0902eb4623a5..0892374f1f76 100644 --- a/html/pfappserver/lib/pfappserver/Base/Model/Search.pm +++ b/html/pfappserver/lib/pfappserver/Base/Model/Search.pm @@ -113,7 +113,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/AdvancedSearch.pm b/html/pfappserver/lib/pfappserver/Form/AdvancedSearch.pm index 5a1cf911ab7e..e29a180bd832 100644 --- a/html/pfappserver/lib/pfappserver/Form/AdvancedSearch.pm +++ b/html/pfappserver/lib/pfappserver/Form/AdvancedSearch.pm @@ -140,7 +140,7 @@ has_field 'filter' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/AdminRoles.pm b/html/pfappserver/lib/pfappserver/Form/Config/AdminRoles.pm index 4cb06873eb25..1311efb1b8a3 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/AdminRoles.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/AdminRoles.pm @@ -186,7 +186,7 @@ sub options_allowed_actions { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/BillingTiers.pm b/html/pfappserver/lib/pfappserver/Form/Config/BillingTiers.pm index 5f96095f77d0..86e54b71b101 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/BillingTiers.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/BillingTiers.pm @@ -107,7 +107,7 @@ sub options_roles { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Cloud.pm b/html/pfappserver/lib/pfappserver/Form/Config/Cloud.pm index e4c3c3383f67..2250b915228d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Cloud.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Cloud.pm @@ -60,7 +60,7 @@ sub options_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Intune.pm b/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Intune.pm index 3572c12d1230..d9277f740171 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Intune.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Intune.pm @@ -60,7 +60,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Connector.pm b/html/pfappserver/lib/pfappserver/Form/Config/Connector.pm index c0dcbfb535fc..65e24e949501 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Connector.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Connector.pm @@ -50,7 +50,7 @@ has_field 'secret' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Domain.pm b/html/pfappserver/lib/pfappserver/Form/Config/Domain.pm index 51d88d732d3f..aceccbe2ae9e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Domain.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Domain.pm @@ -245,7 +245,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/EventLogger.pm b/html/pfappserver/lib/pfappserver/Form/Config/EventLogger.pm index 1d7549c4d29d..35a4bfcbd16d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/EventLogger.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/EventLogger.pm @@ -50,7 +50,7 @@ has_field namespaces => ( =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/EventLogger/syslog.pm b/html/pfappserver/lib/pfappserver/Form/Config/EventLogger/syslog.pm index 62b8cc2282c9..4f2c48ac73bc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/EventLogger/syslog.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/EventLogger/syslog.pm @@ -79,7 +79,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines.pm b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines.pm index 1619bd03950c..d714df04cd93 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines.pm @@ -157,7 +157,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DHCPFilter.pm b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DHCPFilter.pm index 1ce71c0351d5..cb086b9bf3b7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DHCPFilter.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DHCPFilter.pm @@ -151,7 +151,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DNSFilter.pm b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DNSFilter.pm index 5b56dec7a47e..b87b939504db 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DNSFilter.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/DNSFilter.pm @@ -83,7 +83,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/RADIUSFilter.pm b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/RADIUSFilter.pm index 7588042ca51b..634f31203502 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/RADIUSFilter.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/RADIUSFilter.pm @@ -113,7 +113,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/SwitchFilter.pm b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/SwitchFilter.pm index ae8216ef84da..5197175bbe1a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/SwitchFilter.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/SwitchFilter.pm @@ -93,7 +93,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/VlanFilter.pm b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/VlanFilter.pm index b0e1e1d475ff..47cbcf61528e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/VlanFilter.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FilterEngines/VlanFilter.pm @@ -51,6 +51,13 @@ has_field 'run_actions' => ( default => 'enabled' ); +has_field 'actions_synchronous' => ( + type => 'Toggle', + checkbox_value => 'enabled', + unchecked_value => 'disabled', + default => 'disabled' +); + =head2 actions The list of action @@ -118,7 +125,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Combination.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Combination.pm index 1d1d1538943c..c5f361b068da 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Combination.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Combination.pm @@ -88,7 +88,7 @@ has_block definition => ( =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Enterprise.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Enterprise.pm index 4cccd9b03efe..4be84f45ae3f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Enterprise.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Enterprise.pm @@ -52,7 +52,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Fingerprint.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Fingerprint.pm index a0a2079b21c6..1d6a7850dd85 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Fingerprint.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP6_Fingerprint.pm @@ -45,7 +45,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Fingerprint.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Fingerprint.pm index f8814a693635..e0fc017c2dc7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Fingerprint.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Fingerprint.pm @@ -45,7 +45,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Vendor.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Vendor.pm index d9bdc2611f5a..552430800ac5 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Vendor.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/DHCP_Vendor.pm @@ -44,7 +44,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Device.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Device.pm index 3e7eb2547d43..05a87fc592cb 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Device.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Device.pm @@ -56,7 +56,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/MAC_Vendor.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/MAC_Vendor.pm index c9ca1bd00cb2..3849f6ac2f1a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/MAC_Vendor.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/MAC_Vendor.pm @@ -53,7 +53,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Onboard.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Onboard.pm index d42608a41dd2..70e804ef69ee 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Onboard.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Onboard.pm @@ -39,7 +39,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Settings.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Settings.pm index 7ee0cf2eb494..a9b14015bfa4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Settings.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/Settings.pm @@ -71,7 +71,7 @@ sub field_list { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/User_Agent.pm b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/User_Agent.pm index b71e5b0bf688..0dee6eee360b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/User_Agent.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Fingerbank/User_Agent.pm @@ -44,7 +44,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FingerbankSetting.pm b/html/pfappserver/lib/pfappserver/Form/Config/FingerbankSetting.pm index 4090ff2e4737..60282f117a78 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FingerbankSetting.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FingerbankSetting.pm @@ -156,7 +156,7 @@ sub field_list { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO.pm index bf4ef63c22f8..7c98010c8b48 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO.pm @@ -161,7 +161,7 @@ sub options_categories { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/BarracudaNG.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/BarracudaNG.pm index 0c6880dd7c63..9959117cb5b1 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/BarracudaNG.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/BarracudaNG.pm @@ -51,7 +51,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Checkpoint.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Checkpoint.pm index 49b6a98b9c10..365d1882d2d7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Checkpoint.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Checkpoint.pm @@ -39,7 +39,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/CiscoIsePic.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/CiscoIsePic.pm index e11c6ae74a00..6b313c2c5a26 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/CiscoIsePic.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/CiscoIsePic.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/ContentKeeper.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/ContentKeeper.pm new file mode 100644 index 000000000000..1c77addab9b1 --- /dev/null +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/ContentKeeper.pm @@ -0,0 +1,61 @@ +package pfappserver::Form::Config::Firewall_SSO::ContentKeeper; + +=head1 NAME + +pfappserver::Form::Config::Firewall_SSO::ContentKeeper - Web form to add a Content Keeperd firewall + +=head1 DESCRIPTION + +Form definition to create or update a ContentKeeper firewall. + +=cut + +use HTML::FormHandler::Moose; +extends 'pfappserver::Form::Config::Firewall_SSO'; +with 'pfappserver::Base::Form::Role::Help'; + +use pf::config; +use pf::util; +use File::Find qw(find); + +has_field '+port' => + ( + default => 1813, + ); +has_field 'type' => + ( + type => 'Hidden', + default => 'ContentKeeper', + ); + +has_block definition => + ( + render_list => [ qw(id type password port categories networks cache_updates cache_timeout username_format default_realm) ], + ); + +=head1 COPYRIGHT + +Copyright (C) 2005-2021 Inverse inc. + +=head1 LICENSE + +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 2 +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +USA. + +=cut + +__PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; + +1; diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FamilyZone.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FamilyZone.pm index d2464565233a..ff061c381d0a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FamilyZone.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FamilyZone.pm @@ -51,7 +51,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FortiGate.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FortiGate.pm index 35f67f8edde1..af918dd9d588 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FortiGate.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/FortiGate.pm @@ -35,7 +35,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Iboss.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Iboss.pm index 9f7a6a28f540..5b87ac06eb6c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Iboss.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/Iboss.pm @@ -49,7 +49,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JSONRPC.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JSONRPC.pm index d45fc8c6f2df..2bc462f1aaae 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JSONRPC.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JSONRPC.pm @@ -49,7 +49,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JuniperSRX.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JuniperSRX.pm index 54a937460470..0dca1b73363c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JuniperSRX.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/JuniperSRX.pm @@ -64,7 +64,7 @@ has_field 'type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/LightSpeedRocket.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/LightSpeedRocket.pm index 6ccee49b2aaf..08dccf40c59b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/LightSpeedRocket.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/LightSpeedRocket.pm @@ -22,7 +22,7 @@ has_field 'type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/PaloAlto.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/PaloAlto.pm index 3e31a3533fbf..70f1a7a4a6b1 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/PaloAlto.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/PaloAlto.pm @@ -64,7 +64,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/SmoothWall.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/SmoothWall.pm index 4d75f412df09..1af86bb22f97 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/SmoothWall.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/SmoothWall.pm @@ -21,7 +21,7 @@ has_field 'type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/WatchGuard.pm b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/WatchGuard.pm index 895ee5afa503..f44eaece86a5 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/WatchGuard.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Firewall_SSO/WatchGuard.pm @@ -35,7 +35,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/FloatingDevice.pm b/html/pfappserver/lib/pfappserver/Form/Config/FloatingDevice.pm index 8b23d93c8c7e..5e3ca352a38b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/FloatingDevice.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/FloatingDevice.pm @@ -87,7 +87,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Mfa.pm b/html/pfappserver/lib/pfappserver/Form/Config/Mfa.pm index 406d35118883..a9dc0b3137d5 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Mfa.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Mfa.pm @@ -84,7 +84,7 @@ sub options_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Mfa/Akamai.pm b/html/pfappserver/lib/pfappserver/Form/Config/Mfa/Akamai.pm index f78ef8aabe4a..a522bc670012 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Mfa/Akamai.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Mfa/Akamai.pm @@ -95,7 +95,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Mfa/TOTP.pm b/html/pfappserver/lib/pfappserver/Form/Config/Mfa/TOTP.pm index 04d85b5778e0..597351b4f974 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Mfa/TOTP.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Mfa/TOTP.pm @@ -53,7 +53,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Network.pm b/html/pfappserver/lib/pfappserver/Form/Config/Network.pm index 1f217308dce9..f7c38f10a5cc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Network.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Network.pm @@ -160,7 +160,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Network/Routed.pm b/html/pfappserver/lib/pfappserver/Form/Config/Network/Routed.pm index 9fa35ecdcf76..9640cee1998d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Network/Routed.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Network/Routed.pm @@ -158,7 +158,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/NetworkBehaviorPolicy.pm b/html/pfappserver/lib/pfappserver/Form/Config/NetworkBehaviorPolicy.pm index 225f4a3f7ac4..5852f57b7213 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/NetworkBehaviorPolicy.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/NetworkBehaviorPolicy.pm @@ -164,7 +164,7 @@ sub options_device_attributes { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_local.pm b/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_local.pm index 4c53a847d1c9..fbf0e32fd3d2 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_local.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_local.pm @@ -111,7 +111,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_pki.pm b/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_pki.pm index d5060aade8e7..79386397f6e8 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_pki.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/packetfence_pki.pm @@ -202,7 +202,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/scep.pm b/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/scep.pm index e23584607b5a..261529b40634 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/scep.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PKI_Provider/scep.pm @@ -151,7 +151,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pf.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pf.pm index c0d76b315d7b..691dfdd89e24 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pf.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pf.pm @@ -441,7 +441,7 @@ sub get_sms_source_ids { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron.pm index c94571766a2b..8018babeefd6 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron.pm @@ -143,7 +143,7 @@ sub window_help_text { "Window to apply the job to. In the case of a deletion, s =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_cleanup.pm index db3493494836..19b20fa85eb0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_cleanup.pm @@ -55,7 +55,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_maintenance.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_maintenance.pm index 25bfdb180ce5..9946506be3e9 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_maintenance.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/acct_maintenance.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/admin_api_audit_log_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/admin_api_audit_log_cleanup.pm index 58cb441ecd10..1d68829b2b53 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/admin_api_audit_log_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/admin_api_audit_log_cleanup.pm @@ -56,7 +56,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/auth_log_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/auth_log_cleanup.pm index 359b3a57fd69..1e64e2884ea4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/auth_log_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/auth_log_cleanup.pm @@ -55,7 +55,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/bandwidth_maintenance.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/bandwidth_maintenance.pm index 5546114fa80e..597fe436fe0d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/bandwidth_maintenance.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/bandwidth_maintenance.pm @@ -98,7 +98,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/certificates_check.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/certificates_check.pm index 44e3f79a176e..b28133f1df1c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/certificates_check.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/certificates_check.pm @@ -54,7 +54,7 @@ sub default_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cleanup_chi_database_cache.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cleanup_chi_database_cache.pm index c8e87f4975da..cc3b20c4f5a4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cleanup_chi_database_cache.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cleanup_chi_database_cache.pm @@ -50,7 +50,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cluster_check.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cluster_check.pm index 9c4cd622beda..180ef54eb302 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cluster_check.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/cluster_check.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/dns_audit_log_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/dns_audit_log_cleanup.pm index ec3ee6eff9f0..1bb8577feeb7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/dns_audit_log_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/dns_audit_log_cleanup.pm @@ -56,7 +56,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/fingerbank_data_update.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/fingerbank_data_update.pm index 9aef80af3c23..d4bccc32c49e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/fingerbank_data_update.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/fingerbank_data_update.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip4log_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip4log_cleanup.pm index b0564fcfd406..a02da222e703 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip4log_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip4log_cleanup.pm @@ -86,7 +86,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip6log_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip6log_cleanup.pm index e0ee4275b1af..a39bde85cf82 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip6log_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ip6log_cleanup.pm @@ -87,7 +87,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/locationlog_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/locationlog_cleanup.pm index e671017bb2ef..255439266154 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/locationlog_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/locationlog_cleanup.pm @@ -57,7 +57,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_cleanup.pm index 0f34ff4f1cc0..a0601555db24 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_cleanup.pm @@ -58,7 +58,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_current_session_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_current_session_cleanup.pm new file mode 100644 index 000000000000..f13feef01f01 --- /dev/null +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/node_current_session_cleanup.pm @@ -0,0 +1,81 @@ +package pfappserver::Form::Config::Pfcron::node_current_session_cleanup; + +=head1 NAME + +pfappserver::Form::Config::Pfcron::node_current_session_cleanup - Web form for auth_log_cleanup pfcron task + +=head1 DESCRIPTION + +Web form for node_current_session_cleanup pfcron task + +=cut + +use HTML::FormHandler::Moose; + +use pfappserver::Form::Config::Pfcron qw(default_field_method batch_help_text timeout_help_text window_help_text); + +extends 'pfappserver::Form::Config::Pfcron'; +with 'pfappserver::Base::Form::Role::Help'; + +has_field 'batch' => ( + type => 'PosInteger', + default_method => \&default_field_method, + tags => { after_element => \&help, + help => \&batch_help_text }, +); + +has_field 'timeout' => ( + type => 'Duration', + default_method => \&default_field_method, + tags => { after_element => \&help, + help => \&timeout_help_text }, +); + +has_field 'window' => ( + type => 'Duration', + default_method => \&default_field_method, +); + + +=head2 default_type + +default value of type + +=cut + +sub default_type { + return "node_current_session_cleanup"; +} + +has_block definition => + ( + render_list => [qw(type status interval batch timeout window)], + ); + + +=head1 COPYRIGHT + +Copyright (C) 2005-2022 Inverse inc. + +=head1 LICENSE + +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 2 +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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +USA. + +=cut + +__PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; + +1; diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/nodes_maintenance.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/nodes_maintenance.pm index 09504d8cd7c0..7bb03a2affea 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/nodes_maintenance.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/nodes_maintenance.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/option82_query.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/option82_query.pm index 67e945fbfe73..1dab084b625c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/option82_query.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/option82_query.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/password_of_the_day.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/password_of_the_day.pm index 92a5f08aa938..3141291625fc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/password_of_the_day.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/password_of_the_day.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/person_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/person_cleanup.pm index 411251fcf455..6f2e0e10d975 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/person_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/person_cleanup.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/pki_certificates_check.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/pki_certificates_check.pm index a9dcf744653a..1aeeb215e934 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/pki_certificates_check.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/pki_certificates_check.pm @@ -36,7 +36,7 @@ sub default_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/provisioning_compliance_poll.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/provisioning_compliance_poll.pm index 8538635b436c..3cd21046b82e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/provisioning_compliance_poll.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/provisioning_compliance_poll.pm @@ -34,7 +34,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/purge_binary_logs.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/purge_binary_logs.pm index 005cc0c00d1d..76ab96c45168 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/purge_binary_logs.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/purge_binary_logs.pm @@ -43,7 +43,7 @@ sub default_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/radius_audit_log_cleanup.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/radius_audit_log_cleanup.pm index 441a89e35b6c..2fd3b3a1295b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/radius_audit_log_cleanup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/radius_audit_log_cleanup.pm @@ -56,7 +56,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/security_event_maintenance.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/security_event_maintenance.pm index 5959eb5880df..18bdeb466be6 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/security_event_maintenance.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/security_event_maintenance.pm @@ -50,7 +50,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/switch_cache_lldpLocalPort_description.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/switch_cache_lldpLocalPort_description.pm index db91eb495ee9..36e047721164 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/switch_cache_lldpLocalPort_description.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/switch_cache_lldpLocalPort_description.pm @@ -47,7 +47,7 @@ sub default_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ubiquiti_ap_mac_to_ip.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ubiquiti_ap_mac_to_ip.pm index 5cea5ce10e39..ce32e56d857e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ubiquiti_ap_mac_to_ip.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfcron/ubiquiti_ap_mac_to_ip.pm @@ -35,7 +35,7 @@ sub default_type { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect.pm index 07d741db2fe5..9733e824f214 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect.pm @@ -69,7 +69,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/dhcp.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/dhcp.pm index 4ab0c97f434f..8ffb0ed03258 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/dhcp.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/dhcp.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/fortianalyser.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/fortianalyser.pm index ba533f4a70f8..e0e27c3a3294 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/fortianalyser.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/fortianalyser.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/nexpose.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/nexpose.pm index 3a2175750cab..f97079c8ebaf 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/nexpose.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/nexpose.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/regex.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/regex.pm index 4e44e9cbc306..7d9e8dfa8f76 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/regex.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/regex.pm @@ -80,7 +80,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/security_onion.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/security_onion.pm index c976a14dd41d..2368b24732b0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/security_onion.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/security_onion.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/snort.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/snort.pm index c43354467eda..c60bd0ea7fa0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/snort.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/snort.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata.pm index e04a3c9df77e..dd36e30b3db2 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata_md5.pm b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata_md5.pm index 8aff11293f50..5894eb815d38 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata_md5.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Pfdetect/suricata_md5.pm @@ -25,7 +25,7 @@ has_field '+type' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule.pm index 544270da7cda..a7131c806f96 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule.pm @@ -132,7 +132,7 @@ sub dynamic_tables { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication.pm index 0e8c0f0a0e47..4af9d374436f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication.pm @@ -109,7 +109,7 @@ sub options_pid_field { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Billing.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Billing.pm index 6b4870c22f17..04bffd769136 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Billing.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Billing.pm @@ -37,7 +37,7 @@ before 'setup' => sub { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Blackhole.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Blackhole.pm index 38976a7f3564..46d37dde4d36 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Blackhole.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Blackhole.pm @@ -47,7 +47,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Choice.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Choice.pm index 3680558fa595..cb1b84e20baf 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Choice.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Choice.pm @@ -33,7 +33,7 @@ sub child_definition { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Email.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Email.pm index 5ec023a16e9c..3c3f6699a34e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Email.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Email.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Login.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Login.pm index e250582a6185..cc100d62774c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Login.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Login.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Null.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Null.pm index b56b5f42a32e..4e01265f5e8d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Null.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Null.pm @@ -29,7 +29,7 @@ before 'setup' => sub { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth.pm index ed27b0b18e22..5632b02d0913 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth.pm @@ -58,7 +58,7 @@ sub child_definition { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Facebook.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Facebook.pm index a059791beefa..6423ce2978dc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Facebook.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Facebook.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Github.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Github.pm index 691ee62393d7..98c6bf34bd48 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Github.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Github.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Google.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Google.pm index b3a197c93286..5dcab1edadc6 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Google.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/Google.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/LinkedIn.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/LinkedIn.pm index b0637a5321b3..00420240a63b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/LinkedIn.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/LinkedIn.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/OpenID.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/OpenID.pm index 113ededadaf9..8902f71d534b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/OpenID.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/OpenID.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/WindowsLive.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/WindowsLive.pm index 9c2620067f91..5d5d5bd299ab 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/WindowsLive.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/OAuth/WindowsLive.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Password.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Password.pm index 074ec309c49e..157ce8868d71 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Password.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Password.pm @@ -45,7 +45,7 @@ sub auth_module_definition { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SAML.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SAML.pm index 00fb9f7b86bc..7b6cd0177570 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SAML.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SAML.pm @@ -43,7 +43,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SMS.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SMS.pm index e9a7db0dfaee..a4778f1cdb1e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SMS.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/SMS.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Authenticat =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Sponsor.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Sponsor.pm index 45b33d1e3fab..6eaad49d9fa1 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Sponsor.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Authentication/Sponsor.pm @@ -43,7 +43,7 @@ sub auth_module_definition { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Chained.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Chained.pm index c8a77ca8a2c3..59b439b73ec2 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Chained.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Chained.pm @@ -25,7 +25,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::Chained'} =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Choice.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Choice.pm index ad61300f9c9f..1c6ac19ae431 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Choice.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Choice.pm @@ -53,7 +53,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/FixedRole.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/FixedRole.pm index e59dd44c616c..62d29e0c06a8 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/FixedRole.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/FixedRole.pm @@ -48,7 +48,7 @@ sub options_stone_role { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/MFA.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/MFA.pm index 73de643cffac..bc816e253d2e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/MFA.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/MFA.pm @@ -24,7 +24,7 @@ sub for_module {'captiveportal::PacketFence::DynamicRouting::Module::MFA'} =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Message.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Message.pm index 2d248df6e96d..66c5ccc80c9b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Message.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Message.pm @@ -71,7 +71,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Provisioning.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Provisioning.pm index b4cf157cd9da..d3af986592dd 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Provisioning.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Provisioning.pm @@ -43,7 +43,7 @@ sub child_definition { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Root.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Root.pm index d5a8553cd322..c561524bff7b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Root.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Root.pm @@ -30,7 +30,7 @@ before 'setup' => sub { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/RootSSO.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/RootSSO.pm index 6620b0ee382e..fbfcbf703680 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/RootSSO.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/RootSSO.pm @@ -30,7 +30,7 @@ before 'setup' => sub { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SSL_Inspection.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SSL_Inspection.pm index ed348cb84628..5c17e1241340 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SSL_Inspection.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SSL_Inspection.pm @@ -62,7 +62,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SelectRole.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SelectRole.pm index 6772867fcc30..bd649fcbe703 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SelectRole.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/SelectRole.pm @@ -73,7 +73,7 @@ sub options_admin_role { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/ShowLocalAccount.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/ShowLocalAccount.pm index 65366ac69c65..f408747a2296 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/ShowLocalAccount.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/ShowLocalAccount.pm @@ -52,7 +52,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Survey.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Survey.pm index a3cfa2897d37..572c3a0424dc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Survey.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/Survey.pm @@ -61,7 +61,7 @@ sub options_surveys { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/URL.pm b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/URL.pm index aba040f6d9a6..6b99c1698ef9 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/URL.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/PortalModule/URL.pm @@ -64,7 +64,7 @@ sub BUILD { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Profile.pm b/html/pfappserver/lib/pfappserver/Form/Config/Profile.pm index 257b41e727dc..54eba5957c42 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Profile.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Profile.pm @@ -261,7 +261,7 @@ sub options_field_names { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Profile/Default.pm b/html/pfappserver/lib/pfappserver/Form/Config/Profile/Default.pm index 94a2b1e59311..d3472fe2985d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Profile/Default.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Profile/Default.pm @@ -26,7 +26,7 @@ has_field 'status' => (type => 'NonEditable', value => 'enabled', noupdate => 1) =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/ProfileCommon.pm b/html/pfappserver/lib/pfappserver/Form/Config/ProfileCommon.pm index a00a942ba9c7..6d4ceb169ce0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/ProfileCommon.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/ProfileCommon.pm @@ -722,7 +722,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning.pm index 5cc19faa3be9..dfe66b037ef4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning.pm @@ -174,7 +174,7 @@ sub options_security_events { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/accept.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/accept.pm index 3de7cc0ae809..ef0030aae478 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/accept.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/accept.pm @@ -13,7 +13,7 @@ extends 'pfappserver::Form::Config::Provisioning'; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/airwatch.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/airwatch.pm index bc2b6a08ba1e..faa9b0da25fa 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/airwatch.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/airwatch.pm @@ -56,7 +56,7 @@ has_block definition => ( =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/android.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/android.pm index e9cc51397b64..24ef4ad2a1ff 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/android.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/android.pm @@ -13,7 +13,7 @@ extends 'pfappserver::Form::Config::Provisioning::mobileconfig'; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/deny.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/deny.pm index aaee54a0ead8..728436d0b6da 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/deny.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/deny.pm @@ -13,7 +13,7 @@ extends 'pfappserver::Form::Config::Provisioning'; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/dpsk.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/dpsk.pm index 560b6352e802..28ad098a2b9e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/dpsk.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/dpsk.pm @@ -41,7 +41,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/google_workspace_chromebook.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/google_workspace_chromebook.pm index fe2d3de8040d..499280efc66c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/google_workspace_chromebook.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/google_workspace_chromebook.pm @@ -56,7 +56,7 @@ sub default_field_method { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/ibm.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/ibm.pm index 79f68c9a051e..42017b549e91 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/ibm.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/ibm.pm @@ -62,7 +62,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/intune.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/intune.pm index 9f9a513ac55e..313b9c5ea547 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/intune.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/intune.pm @@ -113,7 +113,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/jamf.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/jamf.pm index 5810b0509850..828e6ebee804 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/jamf.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/jamf.pm @@ -74,7 +74,7 @@ has_block definition => ( =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/kandji.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/kandji.pm index d618ced914ba..a683242faf35 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/kandji.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/kandji.pm @@ -46,7 +46,7 @@ has_field 'enroll_url' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileconfig.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileconfig.pm index 36b3161c61fd..aa8c96d676ab 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileconfig.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileconfig.pm @@ -196,7 +196,7 @@ sub option_security { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileiron.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileiron.pm index e4afc49d1679..6e2d5a60b6f9 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileiron.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/mobileiron.pm @@ -59,7 +59,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/opswat.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/opswat.pm index cb556e256bf4..be058d4abade 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/opswat.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/opswat.pm @@ -84,7 +84,7 @@ has_block compliance => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sentinelone.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sentinelone.pm index eeaa7c09bab6..e4078a55cd33 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sentinelone.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sentinelone.pm @@ -70,7 +70,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sepm.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sepm.pm index 1002dee33d2f..726ece5ca053 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sepm.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/sepm.pm @@ -77,7 +77,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/servicenow.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/servicenow.pm index 90ab98ff5aae..661589414c21 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/servicenow.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/servicenow.pm @@ -51,7 +51,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/symantec.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/symantec.pm index 4fce19fac4af..a5f3ec23a1fb 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/symantec.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/symantec.pm @@ -62,7 +62,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/windows.pm b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/windows.pm index 93298f6569ee..a233aa25047d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/windows.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Provisioning/windows.pm @@ -13,7 +13,7 @@ extends 'pfappserver::Form::Config::Provisioning::mobileconfig'; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/EAPProfile.pm b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/EAPProfile.pm index efef41e67921..f9b71f2be693 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/EAPProfile.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/EAPProfile.pm @@ -86,7 +86,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/FastProfile.pm b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/FastProfile.pm index e0fc26bd8a4c..0a33d4fe602f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/FastProfile.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/FastProfile.pm @@ -59,7 +59,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/OCSPProfile.pm b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/OCSPProfile.pm index fab52587dda4..8173a10e495b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/OCSPProfile.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/OCSPProfile.pm @@ -49,7 +49,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/TLSProfile.pm b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/TLSProfile.pm index 720896a48d61..0039a6e381b2 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/TLSProfile.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Radiusd/TLSProfile.pm @@ -89,7 +89,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Realm.pm b/html/pfappserver/lib/pfappserver/Form/Config/Realm.pm index 340e97937bbe..5b02322af654 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Realm.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Realm.pm @@ -391,7 +391,7 @@ sub options_edir { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Roles.pm b/html/pfappserver/lib/pfappserver/Form/Config/Roles.pm index 0915c0fa5e03..dee5c7d34760 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Roles.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Roles.pm @@ -153,7 +153,7 @@ sub options_parent_id { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/SSLCertificate.pm b/html/pfappserver/lib/pfappserver/Form/Config/SSLCertificate.pm index ec9b31816482..1ae59647b4cf 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/SSLCertificate.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/SSLCertificate.pm @@ -50,7 +50,7 @@ has_field 'private_key_password' => ( =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Scan.pm b/html/pfappserver/lib/pfappserver/Form/Config/Scan.pm index 7ba21c6f100a..298f4110fa80 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Scan.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Scan.pm @@ -172,7 +172,7 @@ sub options_categories { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus.pm b/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus.pm index ca3b64b38378..63710bf4cb5e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus.pm @@ -60,7 +60,7 @@ has_field 'nessus_clientpolicy' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus6.pm b/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus6.pm index 0109e1a82fd4..a62c9c0f2494 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus6.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Scan/Nessus6.pm @@ -79,7 +79,7 @@ has_field 'verify_hostname' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Scan/OpenVAS.pm b/html/pfappserver/lib/pfappserver/Form/Config/Scan/OpenVAS.pm index da303715ae18..802fbc395d93 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Scan/OpenVAS.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Scan/OpenVAS.pm @@ -76,7 +76,7 @@ has_field 'openvas_reportformatid' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Scan/Rapid7.pm b/html/pfappserver/lib/pfappserver/Form/Config/Scan/Rapid7.pm index 83ab04a42b81..8120bea5bac3 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Scan/Rapid7.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Scan/Rapid7.pm @@ -149,7 +149,7 @@ sub update_fields { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/SelfService.pm b/html/pfappserver/lib/pfappserver/Form/Config/SelfService.pm index a348b838ac31..2574d155e918 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/SelfService.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/SelfService.pm @@ -119,7 +119,7 @@ sub options_roles { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source.pm index dbeb5df84bc2..72b8d3bd8d0e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source.pm @@ -493,7 +493,7 @@ sub validate_rules { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/AD.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/AD.pm index 00a642df4160..39c56939c83d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/AD.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/AD.pm @@ -20,7 +20,7 @@ has_field '+usernameattribute' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/AdminProxy.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/AdminProxy.pm index d0d2823080c1..75285013a441 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/AdminProxy.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/AdminProxy.pm @@ -72,7 +72,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Authorization.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Authorization.pm index 14eb2782cfd4..5d6665f8b3e0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Authorization.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Authorization.pm @@ -26,7 +26,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/AzureAD.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/AzureAD.pm index b39dfb60d862..1de8c0f1cd40 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/AzureAD.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/AzureAD.pm @@ -62,7 +62,7 @@ has_field 'timeout' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Billing.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Billing.pm index 539ff06d9ece..27d38dbf993d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Billing.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Billing.pm @@ -71,7 +71,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Blackhole.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Blackhole.pm index 1bc773901c69..ccf1185a80a4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Blackhole.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Blackhole.pm @@ -25,7 +25,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Clickatell.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Clickatell.pm index 7794eb31eb8a..1665c07b44fb 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Clickatell.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Clickatell.pm @@ -56,7 +56,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/EAPTLS.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/EAPTLS.pm index c94fa3be59d3..eb05eaca55fd 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/EAPTLS.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/EAPTLS.pm @@ -26,7 +26,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/EDIR.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/EDIR.pm index 4520d212399e..3eecbaec4218 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/EDIR.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/EDIR.pm @@ -15,7 +15,7 @@ extends 'pfappserver::Form::Config::Source::LDAP'; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Eduroam.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Eduroam.pm index ebbcfa273f95..d63d77960d69 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Eduroam.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Eduroam.pm @@ -105,7 +105,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Email.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Email.pm index 807b82cd4429..4bc38095ef66 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Email.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Email.pm @@ -45,7 +45,7 @@ has_field 'activation_domain' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Facebook.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Facebook.pm index 731cfaa5cdd8..594b04a7ca6a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Facebook.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Facebook.pm @@ -99,7 +99,7 @@ has_field 'domains' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Github.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Github.pm index acabd00bf03d..e466cdf9b7be 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Github.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Github.pm @@ -105,7 +105,7 @@ has_field 'domains' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Google.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Google.pm index 2c23a6962be1..cc01cf2f03f0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Google.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Google.pm @@ -107,7 +107,7 @@ has_field 'domains' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/GoogleWorkspaceLDAP.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/GoogleWorkspaceLDAP.pm index 43cae59e46ce..bce184645f9e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/GoogleWorkspaceLDAP.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/GoogleWorkspaceLDAP.pm @@ -64,7 +64,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/HTTP.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/HTTP.pm index e49c9061abe2..5121b7b6a128 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/HTTP.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/HTTP.pm @@ -80,7 +80,7 @@ has_field 'authorization_url' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Htpasswd.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Htpasswd.pm index 1c03e4bdf579..2411b5da722e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Htpasswd.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Htpasswd.pm @@ -54,7 +54,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Kerberos.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Kerberos.pm index 1641d72abffb..20996c8e94f5 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Kerberos.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Kerberos.pm @@ -36,7 +36,7 @@ has_field 'authenticate_realm' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Kickbox.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Kickbox.pm index fbff75b0aadb..31b7e3dec372 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Kickbox.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Kickbox.pm @@ -42,7 +42,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/LDAP.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/LDAP.pm index aed36cb4452c..566e92214d2e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/LDAP.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/LDAP.pm @@ -303,7 +303,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/LinkedIn.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/LinkedIn.pm index 1e8122263fed..8fc8e0340825 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/LinkedIn.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/LinkedIn.pm @@ -106,7 +106,7 @@ has_field 'scope' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Null.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Null.pm index c3951ffd9159..3942c26b2ed1 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Null.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Null.pm @@ -32,7 +32,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/OpenID.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/OpenID.pm index df0dae32c8a0..29bcf4aaae8a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/OpenID.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/OpenID.pm @@ -124,7 +124,7 @@ has_field 'person_mappings.contains' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Paypal.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Paypal.pm index b7cb95361afb..3d00b8ee0fab 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Paypal.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Paypal.pm @@ -121,7 +121,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Potd.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Potd.pm index 70df64c7e77f..caffbdbd490a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Potd.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Potd.pm @@ -72,7 +72,7 @@ has_field 'password_email_update' => ( =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/RADIUS.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/RADIUS.pm index bf7243f86454..2bd416339bb7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/RADIUS.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/RADIUS.pm @@ -93,7 +93,7 @@ sub _options_set_role_from_source { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/SAML.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/SAML.pm index b5b9ededc387..9ecdb42c8d51 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/SAML.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/SAML.pm @@ -36,7 +36,7 @@ has_field 'sp_key_path' => ( has_field 'sp_key_path_upload' => ( type => 'PathUpload', accessor => 'sp_key_path', - config_prefix => '.crt', + config_prefix => '.key', required => 0, upload_namespace => 'sources', ); @@ -71,7 +71,7 @@ has_field 'idp_metadata_path' => ( has_field 'idp_metadata_path_upload' => ( type => 'PathUpload', accessor => 'idp_metadata_path', - config_prefix => '.crt', + config_prefix => '.xml', required => 0, upload_namespace => 'sources', ); @@ -142,7 +142,7 @@ sub options_sources { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/SMS.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/SMS.pm index 3bb8e84124c6..a265e35a0202 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/SMS.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/SMS.pm @@ -89,7 +89,7 @@ sub default_sms_carriers { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/SQL.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/SQL.pm index eec43bb1aef9..bb8b4af159e9 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/SQL.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/SQL.pm @@ -24,7 +24,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/SponsorEmail.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/SponsorEmail.pm index 2daa0d7cfabf..6ec7403b38f7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/SponsorEmail.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/SponsorEmail.pm @@ -100,7 +100,7 @@ sub lang_options { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Stripe.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Stripe.pm index f3792d41d188..d363a50b94e3 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Stripe.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Stripe.pm @@ -96,7 +96,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/Twilio.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/Twilio.pm index aa9172488fc3..4e1a8ff01071 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/Twilio.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/Twilio.pm @@ -83,7 +83,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Source/WindowsLive.pm b/html/pfappserver/lib/pfappserver/Form/Config/Source/WindowsLive.pm index 990d01bfc73f..36d959c786bf 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Source/WindowsLive.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Source/WindowsLive.pm @@ -106,7 +106,7 @@ has_field 'domains' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Switch.pm b/html/pfappserver/lib/pfappserver/Form/Config/Switch.pm index a9f4b8ca1f94..10c5be38d0aa 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Switch.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Switch.pm @@ -710,7 +710,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/SwitchGroup.pm b/html/pfappserver/lib/pfappserver/Form/Config/SwitchGroup.pm index 77f119d26ee5..c1d565036f62 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/SwitchGroup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/SwitchGroup.pm @@ -50,7 +50,7 @@ has_field 'group' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/SwitchImport.pm b/html/pfappserver/lib/pfappserver/Form/Config/SwitchImport.pm index a6303a2e5426..155b9e276170 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/SwitchImport.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/SwitchImport.pm @@ -38,7 +38,7 @@ has_field 'delimiter' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Syslog.pm b/html/pfappserver/lib/pfappserver/Form/Config/Syslog.pm index 76416bd2b739..775d2c0497a7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Syslog.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Syslog.pm @@ -111,7 +111,7 @@ sub html_attributes { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Syslog/file.pm b/html/pfappserver/lib/pfappserver/Form/Config/Syslog/file.pm index e3df620a25b2..520466623637 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Syslog/file.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Syslog/file.pm @@ -24,7 +24,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Syslog/server.pm b/html/pfappserver/lib/pfappserver/Form/Config/Syslog/server.pm index 7abc48bb73e9..eac9595aa296 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Syslog/server.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Syslog/server.pm @@ -46,7 +46,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/TemplateSwitch.pm b/html/pfappserver/lib/pfappserver/Form/Config/TemplateSwitch.pm index 35bd2890e97e..2c6428fbaa19 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/TemplateSwitch.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/TemplateSwitch.pm @@ -105,7 +105,7 @@ for my $n (@RADIUS_ATTRIBUTE_SETS) { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/TrafficShaping.pm b/html/pfappserver/lib/pfappserver/Form/Config/TrafficShaping.pm index bddc4ae6a3d0..7b8a959dd390 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/TrafficShaping.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/TrafficShaping.pm @@ -51,7 +51,7 @@ has_block definition => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Wrix.pm b/html/pfappserver/lib/pfappserver/Form/Config/Wrix.pm index 352907a36dc6..d01d659f5f74 100644 --- a/html/pfappserver/lib/pfappserver/Form/Config/Wrix.pm +++ b/html/pfappserver/lib/pfappserver/Form/Config/Wrix.pm @@ -231,7 +231,7 @@ sub options_UTC_Timezone_group { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/DHCPOption82Search.pm b/html/pfappserver/lib/pfappserver/Form/DHCPOption82Search.pm index ef603a80ab9e..b78d6b40c217 100644 --- a/html/pfappserver/lib/pfappserver/Form/DHCPOption82Search.pm +++ b/html/pfappserver/lib/pfappserver/Form/DHCPOption82Search.pm @@ -117,7 +117,7 @@ has_field 'searches.value' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/DynamicReportSearch.pm b/html/pfappserver/lib/pfappserver/Form/DynamicReportSearch.pm index 467e758b6576..c58deba5988d 100644 --- a/html/pfappserver/lib/pfappserver/Form/DynamicReportSearch.pm +++ b/html/pfappserver/lib/pfappserver/Form/DynamicReportSearch.pm @@ -177,7 +177,7 @@ has_field 'searches.value' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/ApiAction.pm b/html/pfappserver/lib/pfappserver/Form/Field/ApiAction.pm index 075b10bf8354..27cc0c35d72a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/ApiAction.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/ApiAction.pm @@ -103,7 +103,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Country.pm b/html/pfappserver/lib/pfappserver/Form/Field/Country.pm index ca15e6af76c8..5f80dc17627a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Country.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Country.pm @@ -33,7 +33,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/DHCPAnswer.pm b/html/pfappserver/lib/pfappserver/Form/Field/DHCPAnswer.pm index 1d9d255263b9..a1186cb8be1d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/DHCPAnswer.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/DHCPAnswer.pm @@ -186,7 +186,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/DatePicker.pm b/html/pfappserver/lib/pfappserver/Form/Field/DatePicker.pm index 4600679da61d..f6d8adb33a8e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/DatePicker.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/DatePicker.pm @@ -35,7 +35,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/DateTimePicker.pm b/html/pfappserver/lib/pfappserver/Form/Field/DateTimePicker.pm index d0684b752d40..77314844f52f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/DateTimePicker.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/DateTimePicker.pm @@ -58,7 +58,7 @@ sub datetime_deflate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Duration.pm b/html/pfappserver/lib/pfappserver/Form/Field/Duration.pm index 9b47e40df1dd..17073d670004 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Duration.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Duration.pm @@ -196,7 +196,7 @@ sub duration_deflate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/DynamicList.pm b/html/pfappserver/lib/pfappserver/Form/Field/DynamicList.pm index 3954124db78f..cdc0ac322b55 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/DynamicList.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/DynamicList.pm @@ -316,7 +316,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/DynamicTable.pm b/html/pfappserver/lib/pfappserver/Form/Field/DynamicTable.pm index afbf4beab703..7d8dbd403503 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/DynamicTable.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/DynamicTable.pm @@ -43,7 +43,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/ExtendedDuration.pm b/html/pfappserver/lib/pfappserver/Form/Field/ExtendedDuration.pm index 32e457d61ed6..191ab21f383c 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/ExtendedDuration.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/ExtendedDuration.pm @@ -138,7 +138,7 @@ sub duration_deflate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/FilterCondition.pm b/html/pfappserver/lib/pfappserver/Form/Field/FilterCondition.pm index 3292dd7f5275..1705002d1a1a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/FilterCondition.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/FilterCondition.pm @@ -97,7 +97,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/FingerbankField.pm b/html/pfappserver/lib/pfappserver/Form/Field/FingerbankField.pm index ae688e8b2c37..f987a1c4c67f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/FingerbankField.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/FingerbankField.pm @@ -105,7 +105,7 @@ sub _id_from_value { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/FingerbankSelect.pm b/html/pfappserver/lib/pfappserver/Form/Field/FingerbankSelect.pm index 91b666a3bf8c..c460d8a20e9f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/FingerbankSelect.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/FingerbankSelect.pm @@ -119,7 +119,7 @@ sub _deflate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/IP6Address.pm b/html/pfappserver/lib/pfappserver/Form/Field/IP6Address.pm index e3a8291eeef1..ae97bf47dba8 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/IP6Address.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/IP6Address.pm @@ -52,7 +52,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/IPAddress.pm b/html/pfappserver/lib/pfappserver/Form/Field/IPAddress.pm index 81a7e4783ae2..1be5c15db905 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/IPAddress.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/IPAddress.pm @@ -52,7 +52,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/IPAddresses.pm b/html/pfappserver/lib/pfappserver/Form/Field/IPAddresses.pm index e1f0905b15cb..c13b662264bc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/IPAddresses.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/IPAddresses.pm @@ -52,7 +52,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/IPAssigned.pm b/html/pfappserver/lib/pfappserver/Form/Field/IPAssigned.pm index 44d16053d8c6..9c859cf84fd4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/IPAssigned.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/IPAssigned.pm @@ -48,7 +48,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/JSON.pm b/html/pfappserver/lib/pfappserver/Form/Field/JSON.pm index e7424e8d7725..3833175d52d6 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/JSON.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/JSON.pm @@ -33,7 +33,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/MACAddress.pm b/html/pfappserver/lib/pfappserver/Form/Field/MACAddress.pm index 0135cfa03860..b54e93a5f66d 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/MACAddress.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/MACAddress.pm @@ -57,7 +57,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/NetworkBehaviorPolicyAttributeWeight.pm b/html/pfappserver/lib/pfappserver/Form/Field/NetworkBehaviorPolicyAttributeWeight.pm index a1715040064e..df1a30156a7b 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/NetworkBehaviorPolicyAttributeWeight.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/NetworkBehaviorPolicyAttributeWeight.pm @@ -76,7 +76,7 @@ sub action_deflate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/ObfuscatedText.pm b/html/pfappserver/lib/pfappserver/Form/Field/ObfuscatedText.pm index 91d39c58a6f6..07b62a95a3ee 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/ObfuscatedText.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/ObfuscatedText.pm @@ -44,7 +44,7 @@ sub element_attributes { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/PSKLength.pm b/html/pfappserver/lib/pfappserver/Form/Field/PSKLength.pm index bba3d97e813b..6fa190e2f78f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/PSKLength.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/PSKLength.pm @@ -42,7 +42,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Password.pm b/html/pfappserver/lib/pfappserver/Form/Field/Password.pm index fd249481b00d..0543ce452e06 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Password.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Password.pm @@ -21,7 +21,7 @@ sub build_element_attr { } =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Path.pm b/html/pfappserver/lib/pfappserver/Form/Field/Path.pm index f2bcd704f697..20a96268fbaa 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Path.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Path.pm @@ -64,7 +64,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/PathUpload.pm b/html/pfappserver/lib/pfappserver/Form/Field/PathUpload.pm index 87576418ab5a..d220d89d8295 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/PathUpload.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/PathUpload.pm @@ -45,7 +45,7 @@ apply [ =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/PersonMapping.pm b/html/pfappserver/lib/pfappserver/Form/Field/PersonMapping.pm index ffadfdc38f91..51ec2992cd62 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/PersonMapping.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/PersonMapping.pm @@ -91,7 +91,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/PfdetectRegexRule.pm b/html/pfappserver/lib/pfappserver/Form/Field/PfdetectRegexRule.pm index 5390557cb00c..3d45842c4f32 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/PfdetectRegexRule.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/PfdetectRegexRule.pm @@ -158,7 +158,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Port.pm b/html/pfappserver/lib/pfappserver/Form/Field/Port.pm index 4276f2f86360..5d52c914c933 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Port.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Port.pm @@ -24,7 +24,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/PortalModuleAction.pm b/html/pfappserver/lib/pfappserver/Form/Field/PortalModuleAction.pm index 7a38c2355499..892a69ab816f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/PortalModuleAction.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/PortalModuleAction.pm @@ -109,7 +109,7 @@ sub options_roles { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/ProfileFilter.pm b/html/pfappserver/lib/pfappserver/Form/Field/ProfileFilter.pm index 7a065d4a8031..28adb05b8862 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/ProfileFilter.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/ProfileFilter.pm @@ -94,7 +94,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/RE2.pm b/html/pfappserver/lib/pfappserver/Form/Field/RE2.pm index b2de8220cedc..856e2d9795c4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/RE2.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/RE2.pm @@ -54,7 +54,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/RadiusAnswer.pm b/html/pfappserver/lib/pfappserver/Form/Field/RadiusAnswer.pm index 8b2ca9269583..896feb465156 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/RadiusAnswer.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/RadiusAnswer.pm @@ -132,7 +132,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/RadiusAttribute.pm b/html/pfappserver/lib/pfappserver/Form/Field/RadiusAttribute.pm index 572b00f0c5b9..8c8b75acf2da 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/RadiusAttribute.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/RadiusAttribute.pm @@ -72,7 +72,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Regex.pm b/html/pfappserver/lib/pfappserver/Form/Field/Regex.pm index 03d1d61c6393..4166ddf6e4d4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Regex.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Regex.pm @@ -47,7 +47,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/SelectSuggested.pm b/html/pfappserver/lib/pfappserver/Form/Field/SelectSuggested.pm index d69aec31c410..5a271dbcf911 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/SelectSuggested.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/SelectSuggested.pm @@ -39,7 +39,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/SourceRule.pm b/html/pfappserver/lib/pfappserver/Form/Field/SourceRule.pm index fb32f9ede668..5d72b5ee78cb 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/SourceRule.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/SourceRule.pm @@ -165,7 +165,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleAction.pm b/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleAction.pm index c972843b96be..d071333b1fe7 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleAction.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleAction.pm @@ -114,7 +114,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleCondition.pm b/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleCondition.pm index 96e0622d3f91..489348db1c91 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleCondition.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/SourceRuleCondition.pm @@ -131,7 +131,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/SwitchID.pm b/html/pfappserver/lib/pfappserver/Form/Field/SwitchID.pm index f76111a3830a..5181acac13c1 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/SwitchID.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/SwitchID.pm @@ -65,7 +65,7 @@ apply =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/SwitchParam.pm b/html/pfappserver/lib/pfappserver/Form/Field/SwitchParam.pm index 4cfbf77fb8e8..5846cc295c28 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/SwitchParam.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/SwitchParam.pm @@ -87,7 +87,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Text.pm b/html/pfappserver/lib/pfappserver/Form/Field/Text.pm index 20cbdd17161b..6b49352e9977 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Text.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Text.pm @@ -22,7 +22,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/TimePicker.pm b/html/pfappserver/lib/pfappserver/Form/Field/TimePicker.pm index 9e5b786feadd..6f0bbda0cb32 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/TimePicker.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/TimePicker.pm @@ -18,7 +18,7 @@ use namespace::autoclean; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Toggle.pm b/html/pfappserver/lib/pfappserver/Form/Field/Toggle.pm index 6e18d91d59c3..d2bb611d9fc4 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Toggle.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Toggle.pm @@ -45,7 +45,7 @@ sub value { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Trigger.pm b/html/pfappserver/lib/pfappserver/Form/Field/Trigger.pm index 2994084faf82..c3a8e40db3e6 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Trigger.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Trigger.pm @@ -185,7 +185,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Field/Uneditable.pm b/html/pfappserver/lib/pfappserver/Form/Field/Uneditable.pm index 4f3968563ed2..909010bd25d2 100644 --- a/html/pfappserver/lib/pfappserver/Form/Field/Uneditable.pm +++ b/html/pfappserver/lib/pfappserver/Form/Field/Uneditable.pm @@ -20,7 +20,7 @@ has 'escape_value' => ( default => 1, is => 'rw'); =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Interface.pm b/html/pfappserver/lib/pfappserver/Form/Interface.pm index 4b6ddc9b9e17..a81f83c17219 100644 --- a/html/pfappserver/lib/pfappserver/Form/Interface.pm +++ b/html/pfappserver/lib/pfappserver/Form/Interface.pm @@ -215,7 +215,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Interface/Create.pm b/html/pfappserver/lib/pfappserver/Form/Interface/Create.pm index 48b08d5610b7..27b9504d272f 100644 --- a/html/pfappserver/lib/pfappserver/Form/Interface/Create.pm +++ b/html/pfappserver/lib/pfappserver/Form/Interface/Create.pm @@ -28,7 +28,7 @@ has_field 'vlan' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Node.pm b/html/pfappserver/lib/pfappserver/Form/Node.pm index 07d7dc2f647f..e4ca1d7b9b0e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Node.pm +++ b/html/pfappserver/lib/pfappserver/Form/Node.pm @@ -340,7 +340,7 @@ sub _build_readonly { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Node/Create/Import.pm b/html/pfappserver/lib/pfappserver/Form/Node/Create/Import.pm index d630022b654e..800e21c622cc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Node/Create/Import.pm +++ b/html/pfappserver/lib/pfappserver/Form/Node/Create/Import.pm @@ -128,7 +128,7 @@ sub default_default_category_id { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/NodeSearch.pm b/html/pfappserver/lib/pfappserver/Form/NodeSearch.pm index cff887042089..f6329ae35f43 100644 --- a/html/pfappserver/lib/pfappserver/Form/NodeSearch.pm +++ b/html/pfappserver/lib/pfappserver/Form/NodeSearch.pm @@ -49,7 +49,7 @@ has_field 'online_date.end' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Portal.pm b/html/pfappserver/lib/pfappserver/Form/Portal.pm index 1db14ff1ea6f..57ea7126a6d0 100644 --- a/html/pfappserver/lib/pfappserver/Form/Portal.pm +++ b/html/pfappserver/lib/pfappserver/Form/Portal.pm @@ -63,7 +63,7 @@ has_field 'items.status' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/RadiusLogSearch.pm b/html/pfappserver/lib/pfappserver/Form/RadiusLogSearch.pm index e16a2fd6cbb6..6b572f4a1ae2 100644 --- a/html/pfappserver/lib/pfappserver/Form/RadiusLogSearch.pm +++ b/html/pfappserver/lib/pfappserver/Form/RadiusLogSearch.pm @@ -188,7 +188,7 @@ sub validate { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/SecurityEvent.pm b/html/pfappserver/lib/pfappserver/Form/SecurityEvent.pm index bc19b4b6e15b..0c6a7b5f7b37 100644 --- a/html/pfappserver/lib/pfappserver/Form/SecurityEvent.pm +++ b/html/pfappserver/lib/pfappserver/Form/SecurityEvent.pm @@ -473,7 +473,7 @@ sub validate_id { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/User.pm b/html/pfappserver/lib/pfappserver/Form/User.pm index c470b095eb15..a083d7c71a95 100644 --- a/html/pfappserver/lib/pfappserver/Form/User.pm +++ b/html/pfappserver/lib/pfappserver/Form/User.pm @@ -346,7 +346,7 @@ sub update_fields { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/User/Create.pm b/html/pfappserver/lib/pfappserver/Form/User/Create.pm index fa6c43c835c7..a9aec95ed46b 100644 --- a/html/pfappserver/lib/pfappserver/Form/User/Create.pm +++ b/html/pfappserver/lib/pfappserver/Form/User/Create.pm @@ -156,7 +156,7 @@ sub _check_allowed_options { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/User/Create/Import.pm b/html/pfappserver/lib/pfappserver/Form/User/Create/Import.pm index 057a3337d9ac..4b04dfcedf76 100644 --- a/html/pfappserver/lib/pfappserver/Form/User/Create/Import.pm +++ b/html/pfappserver/lib/pfappserver/Form/User/Create/Import.pm @@ -85,7 +85,7 @@ sub init_object { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/User/Create/Multiple.pm b/html/pfappserver/lib/pfappserver/Form/User/Create/Multiple.pm index d2427dee8a27..8a16a4e09697 100644 --- a/html/pfappserver/lib/pfappserver/Form/User/Create/Multiple.pm +++ b/html/pfappserver/lib/pfappserver/Form/User/Create/Multiple.pm @@ -69,7 +69,7 @@ has_field 'login_remaining' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/User/Create/Single.pm b/html/pfappserver/lib/pfappserver/Form/User/Create/Single.pm index 6ca414230628..2c3d02378536 100644 --- a/html/pfappserver/lib/pfappserver/Form/User/Create/Single.pm +++ b/html/pfappserver/lib/pfappserver/Form/User/Create/Single.pm @@ -86,7 +86,7 @@ has_field 'login_remaining' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/UserSearch.pm b/html/pfappserver/lib/pfappserver/Form/UserSearch.pm index c53fa0e245ec..07826b8b8d23 100644 --- a/html/pfappserver/lib/pfappserver/Form/UserSearch.pm +++ b/html/pfappserver/lib/pfappserver/Form/UserSearch.pm @@ -42,7 +42,7 @@ has_field 'direction' => =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Block/Dynamic.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Block/Dynamic.pm index d2601ecb11f9..9a9afc01becc 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Block/Dynamic.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Block/Dynamic.pm @@ -37,7 +37,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Field/ButtonGroup.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Field/ButtonGroup.pm index e7e02d5a5db2..214af467701e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Field/ButtonGroup.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Field/ButtonGroup.pm @@ -83,7 +83,7 @@ sub wrap_radio { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Field/DynamicTable.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Field/DynamicTable.pm index 7725b84b0f24..06a89d641081 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Field/DynamicTable.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Field/DynamicTable.pm @@ -55,7 +55,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Field/ExtendedDuration.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Field/ExtendedDuration.pm index 27bb29925182..15dc11176122 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Field/ExtendedDuration.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Field/ExtendedDuration.pm @@ -59,7 +59,7 @@ use namespace::autoclean; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Field/FingerbankSelect.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Field/FingerbankSelect.pm index 373ea159c31a..be78d2e059df 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Field/FingerbankSelect.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Field/FingerbankSelect.pm @@ -42,7 +42,7 @@ sub render_element { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Field/Span.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Field/Span.pm index fc98462967da..78fb00ea2812 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Field/Span.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Field/Span.pm @@ -42,7 +42,7 @@ sub render_element { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Field/Switch.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Field/Switch.pm index 52414050f995..d9c5da2acd3a 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Field/Switch.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Field/Switch.pm @@ -41,7 +41,7 @@ sub render { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Accordion.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Accordion.pm index dbc9d8781f3c..19f6d8af7744 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Accordion.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Accordion.pm @@ -166,7 +166,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/DynamicTableRow.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/DynamicTableRow.pm index 7299968dd161..f0e5eea8638e 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/DynamicTableRow.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/DynamicTableRow.pm @@ -36,7 +36,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Modal.pm b/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Modal.pm index acc780be0573..1fcd1baaed45 100644 --- a/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Modal.pm +++ b/html/pfappserver/lib/pfappserver/Form/Widget/Wrapper/Modal.pm @@ -50,7 +50,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/I18N/en.po b/html/pfappserver/lib/pfappserver/I18N/en.po index 819170ad33bb..4218fcef92f1 100644 --- a/html/pfappserver/lib/pfappserver/I18N/en.po +++ b/html/pfappserver/lib/pfappserver/I18N/en.po @@ -1,5 +1,5 @@ # English translations for PacketFence package. -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # This file is distributed under the same license as the PacketFence package. # msgid "" diff --git a/html/pfappserver/lib/pfappserver/I18N/fr.po b/html/pfappserver/lib/pfappserver/I18N/fr.po index 04ab5bed1cf9..e755dddfdee1 100644 --- a/html/pfappserver/lib/pfappserver/I18N/fr.po +++ b/html/pfappserver/lib/pfappserver/I18N/fr.po @@ -1,5 +1,5 @@ # English translations for PacketFence package. -# Copyright (C) 2005-2022 Inverse inc. +# Copyright (C) 2005-2023 Inverse inc. # This file is distributed under the same license as the PacketFence package. # # Translators: diff --git a/html/pfappserver/lib/pfappserver/Model/Config/Interface.pm b/html/pfappserver/lib/pfappserver/Model/Config/Interface.pm index 74c8ff52e0d0..79fd901ccd25 100644 --- a/html/pfappserver/lib/pfappserver/Model/Config/Interface.pm +++ b/html/pfappserver/lib/pfappserver/Model/Config/Interface.pm @@ -35,7 +35,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Model/Config/Network.pm b/html/pfappserver/lib/pfappserver/Model/Config/Network.pm index 03c723c68bb3..236341519043 100644 --- a/html/pfappserver/lib/pfappserver/Model/Config/Network.pm +++ b/html/pfappserver/lib/pfappserver/Model/Config/Network.pm @@ -110,7 +110,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Model/Config/Pfconfig.pm b/html/pfappserver/lib/pfappserver/Model/Config/Pfconfig.pm index 3671426d416a..6b2f47983c7e 100644 --- a/html/pfappserver/lib/pfappserver/Model/Config/Pfconfig.pm +++ b/html/pfappserver/lib/pfappserver/Model/Config/Pfconfig.pm @@ -74,7 +74,7 @@ __PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"}; =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Model/Config/System.pm b/html/pfappserver/lib/pfappserver/Model/Config/System.pm index 20595ae087ff..afba7ade479f 100644 --- a/html/pfappserver/lib/pfappserver/Model/Config/System.pm +++ b/html/pfappserver/lib/pfappserver/Model/Config/System.pm @@ -494,7 +494,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Model/DB.pm b/html/pfappserver/lib/pfappserver/Model/DB.pm index 1f8ceca55c9e..d6b82bda2c9b 100644 --- a/html/pfappserver/lib/pfappserver/Model/DB.pm +++ b/html/pfappserver/lib/pfappserver/Model/DB.pm @@ -287,7 +287,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Model/Enforcement.pm b/html/pfappserver/lib/pfappserver/Model/Enforcement.pm index 7fd7aad8f015..6813ff2f09d8 100644 --- a/html/pfappserver/lib/pfappserver/Model/Enforcement.pm +++ b/html/pfappserver/lib/pfappserver/Model/Enforcement.pm @@ -140,7 +140,7 @@ sub _isInArray { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Model/Interface.pm b/html/pfappserver/lib/pfappserver/Model/Interface.pm index 4a7c43be7eb3..690ffec36993 100644 --- a/html/pfappserver/lib/pfappserver/Model/Interface.pm +++ b/html/pfappserver/lib/pfappserver/Model/Interface.pm @@ -888,7 +888,7 @@ sub _build_models { =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Role/Form/RolesAttribute.pm b/html/pfappserver/lib/pfappserver/Role/Form/RolesAttribute.pm index 2be650ddcb0a..1def8bd1ee62 100644 --- a/html/pfappserver/lib/pfappserver/Role/Form/RolesAttribute.pm +++ b/html/pfappserver/lib/pfappserver/Role/Form/RolesAttribute.pm @@ -31,7 +31,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/lib/pfappserver/Role/Form/SecurityEventsAttribute.pm b/html/pfappserver/lib/pfappserver/Role/Form/SecurityEventsAttribute.pm index 2a8daa06a5de..62d7f43726a2 100644 --- a/html/pfappserver/lib/pfappserver/Role/Form/SecurityEventsAttribute.pm +++ b/html/pfappserver/lib/pfappserver/Role/Form/SecurityEventsAttribute.pm @@ -31,7 +31,7 @@ Inverse inc. =head1 COPYRIGHT -Copyright (C) 2005-2022 Inverse inc. +Copyright (C) 2005-2023 Inverse inc. =head1 LICENSE diff --git a/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue b/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue new file mode 100644 index 000000000000..60042d47b01a --- /dev/null +++ b/html/pfappserver/root/src/components/new/BaseButtonSystemService.vue @@ -0,0 +1,227 @@ + + diff --git a/html/pfappserver/root/src/components/new/BaseSystemService.vue b/html/pfappserver/root/src/components/new/BaseSystemService.vue new file mode 100644 index 000000000000..bc5e2280ebcc --- /dev/null +++ b/html/pfappserver/root/src/components/new/BaseSystemService.vue @@ -0,0 +1,158 @@ + + diff --git a/html/pfappserver/root/src/components/new/index.js b/html/pfappserver/root/src/components/new/index.js index a74f5c855a86..10672b3b1606 100644 --- a/html/pfappserver/root/src/components/new/index.js +++ b/html/pfappserver/root/src/components/new/index.js @@ -6,8 +6,12 @@ import BaseButtonRefresh from './BaseButtonRefresh' import BaseButtonSave from './BaseButtonSave' import BaseButtonSaveSearch from './BaseButtonSaveSearch' import BaseButtonService from './BaseButtonService' +<<<<<<< HEAD import BaseButtonServiceSaas from './BaseButtonServiceSaas' import BaseButtonServiceSystem from './BaseButtonServiceSystem' +======= +import BaseButtonSystemService from './BaseButtonSystemService' +>>>>>>> origin/devel import BaseButtonSystemdUpdate from './BaseButtonSystemdUpdate' import BaseButtonUpload from './BaseButtonUpload' import BaseContainerLoading from './BaseContainerLoading' diff --git a/html/pfappserver/root/src/globals/pfSearch.js b/html/pfappserver/root/src/globals/pfSearch.js index 9eda2659ff86..df034137b932 100644 --- a/html/pfappserver/root/src/globals/pfSearch.js +++ b/html/pfappserver/root/src/globals/pfSearch.js @@ -32,6 +32,7 @@ export const pfSearchConditionType = { ROLE: 'role', SOURCE: 'source', SWITCH_GROUP: 'switch_group', + SECURITY_EVENT: 'security_event', } export const pfSearchConditionValue = { @@ -147,6 +148,10 @@ pfConditionOperators[pfSearchConditionType.SWITCH_GROUP] = { 'equals': pfSearchConditionValue.SELECT, 'not_equals': pfSearchConditionValue.SELECT } +pfConditionOperators[pfSearchConditionType.SECURITY_EVENT] = { + 'equals': pfSearchConditionValue.SELECT, + 'not_equals': pfSearchConditionValue.SELECT +} /** * Values of some condition types @@ -297,6 +302,15 @@ pfSearchConditionValues[pfSearchConditionType.SWITCH_GROUP] = (store) => { store.dispatch('config/getSwitchGroups') return store.getters['config/switchGroupsList'] } +pfSearchConditionValues[pfSearchConditionType.SECURITY_EVENT] = (store) => { + store.dispatch('config/getSecurityEvents') + return store.getters['config/sortedSecurityEvents'] + .map(securityEvent => { + const { id: value, desc: text } = securityEvent + return { text, value } + }) + .filter(option => option.text) +} export const pfSearchConditionFormatter = { MAC: 'mac' diff --git a/html/pfappserver/root/src/store/modules/config.js b/html/pfappserver/root/src/store/modules/config.js index 7cd1142a4886..457386606582 100644 --- a/html/pfappserver/root/src/store/modules/config.js +++ b/html/pfappserver/root/src/store/modules/config.js @@ -660,12 +660,12 @@ const getters = { switchGroupsList: state => { if (!state.switchGroups) return [] return state.switchGroups.map((item) => { - return { value: item.id, text: item.id + " - (" + item.description + ")" } + return { value: item.id, text: `${item.id} - ${item.description}` } }) }, switchesList: state => { if (!state.switches) return [] - return [...(new Set([state.switches]))] + return [...(new Set(state.switches))] .sort((a, b) => { if (+a.id === 0) { return 1 @@ -676,7 +676,7 @@ const getters = { return a.description.localeCompare(b.description) }) .map((item) => { - return { value: item.id, text: item.description } + return { value: item.id, text: `${item.id} - ${item.description}` } }) }, securityEventsList: state => { diff --git a/html/pfappserver/root/src/views/Configuration/captivePortal/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/captivePortal/_components/TheForm.vue index 57518ceb192a..79896869cffc 100644 --- a/html/pfappserver/root/src/views/Configuration/captivePortal/_components/TheForm.vue +++ b/html/pfappserver/root/src/views/Configuration/captivePortal/_components/TheForm.vue @@ -94,6 +94,11 @@ :column-label="$i18n.t('Rate limiting threshold')" :text="$i18n.t('Amount of requests on invalid URLs after which the rate limiting will kick in for this device. Requires to restart haproxy-portal in order to apply the change.')" /> + + {{ text }} + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/html/pfappserver/root/src/views/Configuration/firewalls/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/firewalls/_components/TheForm.vue index 30c7b1683ae9..caf661c214e6 100644 --- a/html/pfappserver/root/src/views/Configuration/firewalls/_components/TheForm.vue +++ b/html/pfappserver/root/src/views/Configuration/firewalls/_components/TheForm.vue @@ -20,6 +20,7 @@ import { BaseContainerLoading } from '@/components/new/' import FormTypeBarracudaNg from './FormTypeBarracudaNg' import FormTypeCheckpoint from './FormTypeCheckpoint' +import FormTypeContentKeeper from './FormTypeContentKeeper' import FormTypeCiscoIsePic from './FormTypeCiscoIsePic' import FormTypeFamilyZone from './FormTypeFamilyZone' import FormTypeFortiGate from './FormTypeFortiGate' @@ -37,6 +38,7 @@ const components = { FormTypeBarracudaNg, FormTypeCheckpoint, FormTypeCiscoIsePic, + FormTypeContentKeeper, FormTypeFamilyZone, FormTypeFortiGate, FormTypeIboss, @@ -70,6 +72,8 @@ export const setup = (props) => { return FormTypeBarracudaNg // break case 'Checkpoint': return FormTypeCheckpoint // break + case 'ContentKeeper': + return FormTypeContentKeeper // break case 'CiscoIsePic': return FormTypeCiscoIsePic // break case 'FamilyZone': diff --git a/html/pfappserver/root/src/views/Configuration/firewalls/config.js b/html/pfappserver/root/src/views/Configuration/firewalls/config.js index 53d9f8bd329f..1ae0dacb25fc 100644 --- a/html/pfappserver/root/src/views/Configuration/firewalls/config.js +++ b/html/pfappserver/root/src/views/Configuration/firewalls/config.js @@ -3,6 +3,7 @@ import i18n from '@/utils/locale' export const types = { BarracudaNG: i18n.t('BarracudaNG'), Checkpoint: i18n.t('Checkpoint'), + ContentKeeper: i18n.t('ContentKeeper'), CiscoIsePic: i18n.t('Cisco ISE-PIC'), FamilyZone: i18n.t('FamilyZone'), FortiGate: i18n.t('FortiGate'), diff --git a/html/pfappserver/root/src/views/Configuration/maintenanceTasks/_composables/useCollection.js b/html/pfappserver/root/src/views/Configuration/maintenanceTasks/_composables/useCollection.js index 89a1dedaee33..62694937a260 100644 --- a/html/pfappserver/root/src/views/Configuration/maintenanceTasks/_composables/useCollection.js +++ b/html/pfappserver/root/src/views/Configuration/maintenanceTasks/_composables/useCollection.js @@ -27,6 +27,7 @@ import makeSearch from '@/store/factory/search' import api from '../_api' export const useSearch = makeSearch('maintenanceTasks', { api, + limit: 50, sortBy: null, // use natural order (sortable) columns: [ // output uses natural order (w/ sortable drag-drop), ensure NO columns are 'sortable: true' { diff --git a/html/pfappserver/root/src/views/Configuration/monit/_components/AlertServices.vue b/html/pfappserver/root/src/views/Configuration/monit/_components/AlertServices.vue new file mode 100644 index 000000000000..519a62d5a0f5 --- /dev/null +++ b/html/pfappserver/root/src/views/Configuration/monit/_components/AlertServices.vue @@ -0,0 +1,45 @@ + + + diff --git a/html/pfappserver/root/src/views/Configuration/monit/_components/TheView.js b/html/pfappserver/root/src/views/Configuration/monit/_components/TheView.js index 111cc5fa7f8c..6fd97ba6c867 100644 --- a/html/pfappserver/root/src/views/Configuration/monit/_components/TheView.js +++ b/html/pfappserver/root/src/views/Configuration/monit/_components/TheView.js @@ -1,6 +1,6 @@ import { + AlertServices, BaseView, - FormButtonBar, TheForm } from './' @@ -10,17 +10,36 @@ const components = { TheForm } +import { computed } from '@vue/composition-api' +import { renderHOCWithScopedSlots } from '@/components/new/' import { useViewResource, useViewResourceProps as props } from '../../_composables/useViewResource' - import * as resource from '../_composables/useResource' -const setup = (props, context) => useViewResource(resource, props, context) + +const setup = (props, context) => { + + const viewResource = useViewResource(resource, props, context) + const { + isLoading, + isModified + } = viewResource + + const scopedSlotProps = computed(() => ({ ...props, isLoading: isLoading.value, isModified: isModified.value })) + + return { + ...viewResource, + scopedSlotProps + } +} + +const render = renderHOCWithScopedSlots(BaseView, { components, props, setup }, { + buttonsPrepend: AlertServices +}) // @vue/component export default { name: 'the-view', extends: BaseView, inheritAttrs: false, - components, props, - setup + render } diff --git a/html/pfappserver/root/src/views/Configuration/monit/_components/index.js b/html/pfappserver/root/src/views/Configuration/monit/_components/index.js index 4847957ad35c..0c769e1b0281 100644 --- a/html/pfappserver/root/src/views/Configuration/monit/_components/index.js +++ b/html/pfappserver/root/src/views/Configuration/monit/_components/index.js @@ -5,6 +5,7 @@ import { BaseFormGroupTextarea, BaseFormGroupToggleDisabledEnabled } from '@/components/new/' +import AlertServices from './AlertServices' import TheForm from './TheForm' import TheView from './TheView' @@ -19,6 +20,7 @@ export { BaseFormGroupInput as FormGroupSubjectPrefix, BaseViewResource as BaseView, + AlertServices, TheForm, TheView } diff --git a/html/pfappserver/root/src/views/Configuration/pki/certs/_components/ButtonCertificateDownload.vue b/html/pfappserver/root/src/views/Configuration/pki/certs/_components/ButtonCertificateDownload.vue index 1e6f30824ffc..1f5d610e151d 100644 --- a/html/pfappserver/root/src/views/Configuration/pki/certs/_components/ButtonCertificateDownload.vue +++ b/html/pfappserver/root/src/views/Configuration/pki/certs/_components/ButtonCertificateDownload.vue @@ -111,10 +111,10 @@ const setup = (props, context) => { const onHideModal = () => { isShowModal.value = false } const isValid = useDebouncedWatchHandler([form, isShowModal], () => (!rootRef.value || rootRef.value.$el.querySelectorAll('.is-invalid').length === 0)) const onDownload = () => { - const { ca_id, profile_id } = cert.value + const { ca_id, profile_id, cn } = cert.value $store.dispatch('$_pkis/getProfile', profile_id).then(profile => { $store.dispatch('$_pkis/getCa', ca_id).then(ca => { - const filename = `${ca.cn}-${profile.name}-${cert.cn}.p12` + const filename = `${ca.cn}-${profile.name}-${cn}.p12` const { password } = form.value || {} $store.dispatch('$_pkis/downloadCert', { id: id.value, password }).then(arrayBuffer => { if (clipboard.value) { @@ -151,7 +151,9 @@ const setup = (props, context) => { isShowModal, onShowModal, onHideModal, - onDownload + onDownload, + + cert } } diff --git a/html/pfappserver/root/src/views/Configuration/securityEvents/schema.js b/html/pfappserver/root/src/views/Configuration/securityEvents/schema.js index f4ed8ed0497d..090137de187b 100644 --- a/html/pfappserver/root/src/views/Configuration/securityEvents/schema.js +++ b/html/pfappserver/root/src/views/Configuration/securityEvents/schema.js @@ -87,13 +87,38 @@ const schemaWhiteListedRole = yup.string().nullable() const schemaWhiteListedRoles = yup.array().ensure().of(schemaWhiteListedRole) +const schemaIntervalUnit = intervalUnit => { + // fix: #7420 + // interval and unit are mutually required + // if interval is defined then unit is required + // if unit is defined then interval is required + const { interval, unit } = intervalUnit || {} + return yup.object({ + interval: ((unit) + ? yup.string().nullable().required(i18n.t('Interval required.')) + : yup.string().nullable() + ), + unit: ((interval) + ? yup.string().nullable().required(i18n.t('Unit required.')) + : yup.string().nullable() + ), + }) +} + export const schema = (props) => { const { + form, id, isNew, - isClone + isClone, } = props + const { + grace, + window, + delay_by + } = form || {} + return yup.object({ id: yup.string() .nullable() @@ -105,7 +130,10 @@ export const schema = (props) => { .required(i18n.t('Description required.')) .label(i18n.t('Description')), priority: yup.string().nullable().label(i18n.t('Priority')), - whitelisted_roles: schemaWhiteListedRoles + whitelisted_roles: schemaWhiteListedRoles, + grace: schemaIntervalUnit(grace), + window: schemaIntervalUnit(window), + delay_by: schemaIntervalUnit(delay_by), }) } diff --git a/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/AlertServices.vue b/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/AlertServices.vue new file mode 100644 index 000000000000..da310eae01dd --- /dev/null +++ b/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/AlertServices.vue @@ -0,0 +1,42 @@ + + + diff --git a/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/TheView.js b/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/TheView.js index d006b2277d8d..0eddb66e52b3 100644 --- a/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/TheView.js +++ b/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/TheView.js @@ -1,4 +1,5 @@ import { + AlertServices, BaseView, FormButtonBar, TheForm @@ -9,6 +10,8 @@ const components = { TheForm } +import { computed } from '@vue/composition-api' +import { renderHOCWithScopedSlots } from '@/components/new/' import { useViewCollectionItem, useViewCollectionItemProps } from '../../_composables/useViewCollectionItem' import * as collection from '../_composables/useCollection' @@ -17,7 +20,25 @@ const props = { ...collection.useItemProps } -const setup = (props, context) => useViewCollectionItem(collection, props, context) +const setup = (props, context) => { + + const viewCollectionItem = useViewCollectionItem(collection, props, context) + const { + isLoading, + isModified + } = viewCollectionItem + + const scopedSlotProps = computed(() => ({ ...props, isLoading: isLoading.value, isModified: isModified.value })) + + return { + ...viewCollectionItem, + scopedSlotProps + } +} + +const render = renderHOCWithScopedSlots(BaseView, { components, props, setup }, { + buttonsPrepend: AlertServices +}) // @vue/component export default { @@ -26,5 +47,5 @@ export default { extends: BaseView, components, props, - setup + render } diff --git a/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/index.js b/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/index.js index 8239d1e1e07a..ec65549bc336 100644 --- a/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/index.js +++ b/html/pfappserver/root/src/views/Configuration/syslogForwarders/_components/index.js @@ -7,6 +7,7 @@ import { BaseFormGroupInputNumber, BaseFormGroupToggleDisabledEnabled } from '@/components/new/' +import AlertServices from './AlertServices' import TheForm from './TheForm' import TheView from './TheView' @@ -21,6 +22,7 @@ export { BaseFormGroupInputNumber as FormGroupPort, BaseFormGroupChosenOne as FormGroupProto, + AlertServices, TheForm, TheView } diff --git a/html/pfappserver/root/src/views/Status/network_threats/_api.js b/html/pfappserver/root/src/views/Status/network_threats/_api.js index 82b89581c9a0..7bc1673068bd 100644 --- a/html/pfappserver/root/src/views/Status/network_threats/_api.js +++ b/html/pfappserver/root/src/views/Status/network_threats/_api.js @@ -16,6 +16,11 @@ export default { return response.data }) }, + totalPending: () => { + return apiCall.get('security_events/total_pending').then(response => { + return response.data + }) + }, perDeviceClassOpen: () => { return apiCall.get('security_events/per_device_class_open').then(response => { return response.data @@ -26,6 +31,11 @@ export default { return response.data }) }, + perDeviceClassPending: () => { + return apiCall.get('security_events/per_device_class_pending').then(response => { + return response.data + }) + }, perSecurityEventOpen: () => { return apiCall.get('security_events/per_security_event_id_open').then(response => { return response.data @@ -36,6 +46,11 @@ export default { return response.data }) }, + perSecurityEventPending: () => { + return apiCall.get('security_events/per_security_event_id_pending').then(response => { + return response.data + }) + }, } diff --git a/html/pfappserver/root/src/views/Status/network_threats/_components/BaseFilterSecurityEvents.vue b/html/pfappserver/root/src/views/Status/network_threats/_components/BaseFilterSecurityEvents.vue index 3ae353df5912..14024a7e06e4 100644 --- a/html/pfappserver/root/src/views/Status/network_threats/_components/BaseFilterSecurityEvents.vue +++ b/html/pfappserver/root/src/views/Status/network_threats/_components/BaseFilterSecurityEvents.vue @@ -40,6 +40,8 @@ variant="danger" class="ml-1">{{ item._open }} {{ $i18n.t('open') }} {{ item._closed }} {{ $i18n.t('closed') }} + {{ item._pending }} {{ $i18n.t('pending') }} @@ -75,6 +77,7 @@ const setup = (props, context) => { const perSecurityEventOpen = computed(() => $store.getters['$_network_threats/perSecurityEventOpen']) const perSecurityEventClosed = computed(() => $store.getters['$_network_threats/perSecurityEventClosed']) + const perSecurityEventPending = computed(() => $store.getters['$_network_threats/perSecurityEventPending']) const items = ref([]) onMounted(() => { @@ -88,8 +91,9 @@ const setup = (props, context) => { const { id } = item const _open = perSecurityEventOpen.value[id] || 0 const _closed = perSecurityEventClosed.value[id] || 0 + const _pending = perSecurityEventPending.value[id] || 0 return { ...item, - _open, _closed } + _open, _closed, _pending } })) const filter = ref('') diff --git a/html/pfappserver/root/src/views/Status/network_threats/_components/TheView.vue b/html/pfappserver/root/src/views/Status/network_threats/_components/TheView.vue index 2d1f1f5ee9c9..0e73d11cbb1d 100644 --- a/html/pfappserver/root/src/views/Status/network_threats/_components/TheView.vue +++ b/html/pfappserver/root/src/views/Status/network_threats/_components/TheView.vue @@ -101,9 +101,12 @@ - + + + +