Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel' into feature/cloud-nac
Browse files Browse the repository at this point in the history
  • Loading branch information
@satkunas
satkunas committed Jan 25, 2023
2 parents 6570279 + 76720e4 commit 2a494ec
Show file tree
Hide file tree
Showing 2,027 changed files with 3,768 additions and 5,250 deletions.
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
19 changes: 18 additions & 1 deletion NEWS.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,32 @@ For a list of compatibility related changes see the <<PacketFence_Upgrade_Guide.
=== New Features
* Content Keeper firewall SSO support
* Added support for Unifi OS controllers (#7368)
=== Enhancements
* Allow proxysql to be configure to connect to a single external database.
* Allow image files to be uploaded in a connection profile.
* Added System Service and Systemd buttons in Admin UI.
* Online/offline doesn't rely on recording the bandwidth accounting data anymore
* Pending security events added to network threats visualization
* Allow to expose the fingerbank_info variable to all HTML portal templates (#7460)
* VLAN filters actions can now be done synchronously (#7351)
* Support for wired connection on Ruckus SmartZone
=== Bug Fixes
* Force the destination IP for UDP packets going through the pfconnector (#7323)
* Clear the active dynamic reverses that exist when a pfconnector reconnects
* OpenID Authentication Source -Duplicated Username (#7399)
* Unable to upgrade to Debian 11.6 with PF 11.X and 12.X (#7438)
* Trust server certificates when provisioning Apple devices for EAP-TLS (#7428)
* Use WPA2 in place of WPA when provisioning Apple devices (#7428)
* Creating/modifying/deleting a syslog forwarder should prompt to restart rsyslog in the admin (#6532)
* Fixed utf8 encoding in email body (#7422)
* Escape quotes in LDAP passwords (AD source: too complex password prevent RADIUS to start #3976)
* Use the proper file extensions when uploading SAML config files. (ZEN 12.1 - XML File Renamed on upload. #7439)
== Version 12.1.0 released on 2022-11-22
Expand Down
2 changes: 1 addition & 1 deletion addons/AD/migrate.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/assign-owner.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/backup-and-maintenance.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - compressed $PF_DIRECTORY to $BACKUP_DIRECTORY, rotate and clean
# - compressed mysqldump to $BACKUP_DIRECTORY, rotate and clean
#
# Copyright (C) 2005-2022 Inverse inc.
# Copyright (C) 2005-2023 Inverse inc.
#
# Author: Inverse inc. <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion addons/captive-portal/proxy-bypass/squid-redirector.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/bin/generator-data-access-layer.pl
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/bin/generator-template-switches-defaults.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
Empty file modified addons/dev-helpers/bin/generator-unified-api-config.pl
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion addons/dev-helpers/bin/switch_options.pl
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/bin/switch_options_table.pl
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/centos-chroot/make_chroot.sh
View file
Original file line number Diff line number Diff line change
@@ -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. <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/git/pre-commit.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/radius-hook.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/dev-helpers/templates/unittest-UnifiedApi-Controller-Config.t.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Inverse inc. <[email protected]>
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
8 changes: 4 additions & 4 deletions addons/dev-helpers/vim/perl-support-templates/comments.templates
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Inverse inc. <[email protected]>

=head1 COPYRIGHT

Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.

=head1 LICENSE

Expand Down Expand Up @@ -90,7 +90,7 @@ Inverse inc. <[email protected]>

=head1 COPYRIGHT

Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.

=head1 LICENSE

Expand Down Expand Up @@ -154,7 +154,7 @@ Inverse inc. <[email protected]>

=head1 COPYRIGHT

Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.

=head1 LICENSE

Expand Down Expand Up @@ -191,7 +191,7 @@ Inverse inc. <[email protected]>

=head1 COPYRIGHT

Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.

=head1 LICENSE

Expand Down
2 changes: 1 addition & 1 deletion addons/dhcp_dumper.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions addons/extract_i18n_strings.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ sub print_po {

print <<EOT;
# English translations for $package package.
# Copyright (C) 2005-2022 Inverse inc.
# Copyright (C) 2005-2023 Inverse inc.
# This file is distributed under the same license as the $package package.
#
msgid ""
Expand Down Expand Up @@ -522,7 +522,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/extract_i18n_strings_api.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
4 changes: 2 additions & 2 deletions addons/extract_i18n_strings_portal.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ sub print_po {

print <<EOT;
# English translations for $package package.
# Copyright (C) 2005-2022 Inverse inc.
# Copyright (C) 2005-2023 Inverse inc.
# This file is distributed under the same license as the $package package.
#
msgid ""
Expand Down Expand Up @@ -338,7 +338,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
30 changes: 28 additions & 2 deletions addons/full-upgrade/run-upgrade.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ source /usr/local/pf/addons/full-upgrade/helpers.functions
source /usr/local/pf/addons/full-upgrade/database.functions
source /usr/local/pf/addons/full-upgrade/configuration.functions

function get_libmariadb_dev() {
libmariadb_version=$(dpkg -l libmariadb-dev|grep '^ii'|cut -d ':' -f 2 | cut -d '+' -f 1)
if [ -n "${libmariadb_version}" ]; then
echo ${libmariadb_version}
else
# 1 = false
return 1
fi
}


function backup_git_commit_id() {
if [ `cat /usr/local/pf/conf/git_commit_id` = "%{git_commit}" ]; then
echo "Broken git_commit_id detected, will have to guess which commit ID this build is based on"
Expand All @@ -32,10 +43,24 @@ function backup_pf_release() {
}

function upgrade_packetfence_package() {
local include_os_update=$1
if is_rpm_based; then
yum_upgrade_packetfence_package $1
yum_upgrade_packetfence_package $include_os_update
elif is_deb_based; then
apt_upgrade_packetfence_package $1
if get_libmariadb_dev; then
if dpkg --compare-versions "${libmariadb_version}" le "10.5.15"; then
echo "libmariadb-dev ${libmariadb_version} detected"
echo "OS upgrade can't be performed until libmariadb-dev is uninstalled"
include_os_update=no
# cover fresh installations performed on Debian 11.6 before libmariadb-dev dependencies was removed
else
echo "libmariadb-dev ${libmariadb_version} detected"
echo "OS upgrade can occur"
fi
else
echo "Unable to detect a libmariadb-dev package, upgrade will continue"
fi
apt_upgrade_packetfence_package $include_os_update
else
echo "Unable to detect package manager to upgrade PacketFence"
exit 1
Expand Down Expand Up @@ -76,6 +101,7 @@ function apt_upgrade_packetfence_package() {
else
DEBIAN_FRONTEND=noninteractive apt install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" packetfence -y
fi
DEBIAN_FRONTEND=noninteractive apt autoremove -q -y
}

function yum_upgrade_packetfence_package() {
Expand Down
2 changes: 1 addition & 1 deletion addons/high-availability/pf-diff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Highlight changes between pf servers
#
# Copyright (C) 2005-2022 Inverse inc.
# Copyright (C) 2005-2023 Inverse inc.
#
# Author: Inverse inc. <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion addons/high-availability/rdiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion addons/import-node-csv.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/integration-testing/replay-snmptrapd-logs.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/locationlog-cleanup.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/packages/packetfence-rpm-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion addons/packages/perl-Net-Appliance-Session.spec.diff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# http://packetfence.org/bugs/view.php?id=1556
#
# Olivier Bilodeau <[email protected]>
# 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
Expand Down
2 changes: 1 addition & 1 deletion addons/pfconfig/comparator/comparator.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
2 changes: 1 addition & 1 deletion addons/pfconfig/comparator/config-comparator.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. <[email protected]>
#
Expand Down
2 changes: 1 addition & 1 deletion addons/replay-pcap.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ =head1 AUTHOR
=head1 COPYRIGHT
Copyright (C) 2005-2022 Inverse inc.
Copyright (C) 2005-2023 Inverse inc.
=head1 LICENSE
Expand Down
Loading

0 comments on commit 2a494ec

Please sign in to comment.