Merge pull request #2190 from akrherz/v468

denote Openfire 4.6.8 Release

.github/workflows/continuous-integration-workflow.yml

@@ -57,8 +57,7 @@ jobs:
   aioxmpp:
 
     name: Execute aioxmpp-based CI tests
-    # ubuntu-latest may have issues with Epoll python events
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: build
 
     steps:
@@ -77,9 +76,9 @@ jobs:
           chmod +x ./runAioxmppIntegrationTests
 
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.11.2
 
       - name: Run aioxmpp tests
         run: ./runAioxmppIntegrationTests -d -l -h example.org -i 127.0.0.1 || ./runAioxmppIntegrationTests -d -l -h example.org -i 127.0.0.1 || ./runAioxmppIntegrationTests -d -l -h example.org -i 127.0.0.1 # Try tests a few times, in case of flakiness

distribution/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.8-SNAPSHOT</version>
+        <version>4.6.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

i18n/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-	<version>4.6.8-SNAPSHOT</version>
+	<version>4.6.8</version>
     </parent>
     <artifactId>i18n</artifactId>
     <name>Internationalization files for Openfire</name>

plugins/openfire-plugin-assembly-descriptor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.8-SNAPSHOT</version>
+        <version>4.6.8</version>
     </parent>
     <groupId>org.igniterealtime.openfire.plugins</groupId>
     <artifactId>openfire-plugin-assembly-descriptor</artifactId>

plugins/pom.xml

@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.igniterealtime.openfire</groupId>
-    <version>4.6.8-SNAPSHOT</version>
+    <version>4.6.8</version>
     <artifactId>plugins</artifactId>
     <packaging>pom</packaging>
     <name>Openfire Plugins</name>
@@ -120,7 +120,7 @@
         <plugin.name>${project.artifactId}</plugin.name>
 
         <!-- Versions -->
-        <openfire.version>4.6.8-SNAPSHOT</openfire.version>
+        <openfire.version>4.6.8</openfire.version>
         <!-- Note; the following jetty.version should be identical to the jetty.version in xmppserver/pom.xml -->
         <jetty.version>9.4.35.v20201120</jetty.version>
     </properties>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>parent</artifactId>
-    <version>4.6.8-SNAPSHOT</version>
+    <version>4.6.8</version>
     <name>Parent</name>
     <packaging>pom</packaging>
 

runAioxmppIntegrationTests

@@ -89,10 +89,9 @@ function setUpAioxmppEnvironment {
     	git clone -b devel https://github.com/horazont/aioxmpp "${AIOXMPPDIR}"
     	pushd "${AIOXMPPDIR}"
 	fi
-	python3.9 -m pip install setuptools
-	python3.9 -m pip install pytest
-	python3.9 -m pip install pytest-cov
-	python3.9 -m pip install -e .
+	python3.11 -m pip install setuptools
+	python3.11 -m pip install pytest pytest-cov coveralls pyOpenSSL pytz
+    python3.11 -m pip install .
     cat >"${AIOXMPPCONFIG}" <<EOL
 [global]
 provisioner=aioxmpp.e2etest.provision.AnonymousProvisioner
@@ -138,10 +137,10 @@ function launchOpenfire {
 function runTests {
 	echo "Starting Integration Tests (using aioxmpp)…"
     pushd "${AIOXMPPDIR}"
-    which python3.9
+    which python3.11
 	if [ -d output ]; then rm -Rf output; fi
     mkdir output
-    python3.9 -m pytest -p aioxmpp.e2etest --e2etest-config="${AIOXMPPCONFIG}" --e2etest-only -k 'not test_set_topic and not test_publish_and_purge and not test_publish_multiple_and_get_by_id' tests 2>&1 | tee output/aioxmpp.test.output.txt
+    python3.11 -m pytest -p aioxmpp.e2etest --e2etest-config="${AIOXMPPCONFIG}" --e2etest-only -k 'not test_set_topic and not test_publish_and_purge and not test_publish_multiple_and_get_by_id' tests 2>&1 | tee output/aioxmpp.test.output.txt
 	if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi;
     popd
 }

starter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>org.igniterealtime.openfire</groupId>
-        <version>4.6.8-SNAPSHOT</version>
+        <version>4.6.8</version>
     </parent>
     <artifactId>starter</artifactId>
     <name>Starter for Openfire</name>

xmppserver/changelog.html

@@ -162,6 +162,16 @@ <h1>Openfire Changelog</h1>
 
     <div id="pageBody">
 
+<h2>4.6.8 -- <span style="font-weight: normal;">May 23, 2023</span></h2>
+<h3>Bug</h3>
+<ul>
+        <li><a href="https://igniterealtime.atlassian.net/browse/OF-2595">[OF-2595]</a> - CVE-2023-32315 Admin Console Auth Bypass.</li>
+        <li><a href="https://igniterealtime.atlassian.net/browse/OF-2596">[OF-2596]</a> - OF-2596 Improve detection of path traversal.</li>
+        <li><a href="https://igniterealtime.atlassian.net/browse/OF-2597">[OF-2597]</a> - OF-2597 Add config option for using wildcards in AuthCheckFilter.</li>
+        <li><a href="https://igniterealtime.atlassian.net/browse/OF-2598">[OF-2598]</a> - OF-2598 Remove wildcard usage in AuthCheckFilter.</li>
+        <li><a href="https://igniterealtime.atlassian.net/browse/OF-2599">[OF-2599]</a> - OF-2599 Avoid having setup-specific auth-excludes after install.</li>
+</ul>
+
 <h2>4.6.7 -- <span style="font-weight: normal;">January 3, 2022</span></h2>
 <h3>Bug</h3>
 <ul>

xmppserver/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.igniterealtime.openfire</groupId>
         <artifactId>parent</artifactId>
-        <version>4.6.8-SNAPSHOT</version>
+        <version>4.6.8</version>
     </parent>
     <artifactId>xmppserver</artifactId>
     <name>Core XMPP Server</name>

xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java

@@ -39,7 +39,7 @@ public class XMPPServerInfoImpl implements XMPPServerInfo {
 
     private final Date startDate;
 
-    public static final Version VERSION = new Version(4, 6, 8, Version.ReleaseStatus.Alpha, -1 );
+    public static final Version VERSION = new Version(4, 6, 8, Version.ReleaseStatus.Release, -1 );
 
     /**
      * Simple constructor