From b0eaf3b05d01e25bf54973e9d38e3062d626c0e6 Mon Sep 17 00:00:00 2001
From: Kathia Barahona <kathia.barahona@aiven.io>
Date: Thu, 15 Aug 2024 14:29:08 +0200
Subject: [PATCH] Build PG17

---
 .github/workflows/build.yml |  4 +--
 .idea/workspace.xml         | 68 +++++++++++++++++++++++++++++++++++++
 src/aiven_gatekeeper.c      | 12 ++++++-
 3 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 .idea/workspace.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b8de7a..5dca70b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        pg-version: [11, 12, 13, 14, 15, 16]
+        pg-version: [11, 12, 13, 14, 15, 16, 17]
     steps:
       - id: install
         run: |
@@ -25,7 +25,7 @@ jobs:
           # Get the postgresql gpg key
           sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7FCC7D46ACCC4CF8
           # Setup the Postgres repositories
-          sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main ${{ matrix.pg-version }}" > /etc/apt/sources.list.d/pgdg.list'
           sudo apt-get update
           # Install build deps
           sudo apt-get install -y postgresql-server-dev-${{ matrix.pg-version }}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..e907fca
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="e65d6af3-a350-461e-8f47-1dab78c153ca" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/aiven-pg-security.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.github/workflows/build.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/build.yml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 2
+}</component>
+  <component name="ProjectId" id="2kh94ZKU9ysdwjHPX7FiR9dxMw9" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/kathia.barahona/Desktop/aiven-dev/aiven-pg-security&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-PY-241.18034.82" />
+        <option value="bundled-python-sdk-975db3bf15a3-2767605e8bc2-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-241.18034.82" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="e65d6af3-a350-461e-8f47-1dab78c153ca" name="Changes" comment="" />
+      <created>1723724750186</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1723724750186</updated>
+      <workItem from="1723724751284" duration="7507000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/aiven_gatekeeper.c b/src/aiven_gatekeeper.c
index 4a4355d..eb2b7ee 100644
--- a/src/aiven_gatekeeper.c
+++ b/src/aiven_gatekeeper.c
@@ -36,6 +36,16 @@
 
 PG_MODULE_MAGIC;
 
+/* Check the PostgreSQL version */
+#if PG_VERSION_NUM >= 170000
+/* For PostgreSQL 17 and later, use current_role_is_superuser */
+#define SUPERUSER_CHECK current_role_is_superuser
+#else
+/* For earlier versions, use session_auth_is_superuser */
+#define SUPERUSER_CHECK session_auth_is_superuser
+#endif
+
+
 void _PG_init(void);
 void _PG_fini(void);
 
@@ -141,7 +151,7 @@ is_elevated(void)
     is_superuser = superuser_arg(currentUserId);
 
     /* elevated to supersuser when the session auth user does not have superuser privileges */
-    return is_superuser && !session_auth_is_superuser;
+    return is_superuser && !SUPERUSER_CHECK();
 }
 
 static bool