From 6787d3fa9f7ad36201f2d19723c609db3d8f346a Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 12 Aug 2021 23:11:15 -0700
Subject: [PATCH] GUACAMOLE-1366: Correct sort order of connection history
 entries.

The sort order of connection history entries should be descending, with
the most recent connection attempt shown first. This has been incorrect
since 1.3.0 due to the migration to the newer, searchable/sortable
history structure.
---
 .../apache/guacamole/rest/connection/ConnectionResource.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
index cbd7c5e8d..15586e187 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.GuacamoleSecurityException;
 import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.net.auth.ActivityRecordSet;
 import org.apache.guacamole.net.auth.Connection;
 import org.apache.guacamole.net.auth.Directory;
 import org.apache.guacamole.net.auth.Permissions;
@@ -163,7 +164,8 @@ public class ConnectionResource extends DirectoryObjectResource<Connection, APIC
 
         // Try the current getConnectionHistory() method, first, for connection history.
         try {
-            return new ConnectionHistoryResource(connection.getConnectionHistory());
+            return new ConnectionHistoryResource(connection.getConnectionHistory()
+                    .sort(ActivityRecordSet.SortableProperty.START_DATE, true));
         }
         catch (GuacamoleUnsupportedException e) {
             logger.debug("Call to getConnectionHistory() is unsupported, falling back to getHistory().", e);