Merge branch 'master' into feature/generate-phrase

qdrvm · Feb 13, 2025 · 146abd2 · 146abd2
2 parents 19b7442 + c397bf1
commit 146abd2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 16 deletions.
diff --git a/core/parachain/pvf/kagome_pvf_worker.cpp b/core/parachain/pvf/kagome_pvf_worker.cpp
@@ -163,6 +163,8 @@ namespace kagome::parachain {
 
     auto abi = ::syscall(
         SYS_landlock_create_ruleset, NULL, 0, LANDLOCK_CREATE_RULESET_VERSION);
+    auto logger = log::createLogger("Landlock", "parachain");
+    SL_INFO(logger, "Landlock ABI version: {} ", abi);
     if (abi < 0) {
       return getLastErr("landlock_create_ruleset");
     }
@@ -175,19 +177,26 @@ namespace kagome::parachain {
             | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR
             | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK
             | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK
-            | LANDLOCK_ACCESS_FS_MAKE_SYM
+            | LANDLOCK_ACCESS_FS_MAKE_SYM};
+
+    // only add Landlock V2+ features if defined and supported by the (runtime)
+    // kernel
 #ifdef LANDLOCK_ACCESS_FS_REFER
-            | LANDLOCK_ACCESS_FS_REFER
+    if (abi >= 2) {
+      ruleset_attr.handled_access_fs |= LANDLOCK_ACCESS_FS_REFER;
+    }
 #endif
 #ifdef LANDLOCK_ACCESS_FS_TRUNCATE
-            | LANDLOCK_ACCESS_FS_TRUNCATE
+    if (abi >= 3) {
+      ruleset_attr.handled_access_fs |= LANDLOCK_ACCESS_FS_TRUNCATE;
+    }
 #endif
-        ,
 #ifdef LANDLOCK_ACCESS_NET_CONNECT_TCP
-        .handled_access_net =
-            LANDLOCK_ACCESS_NET_BIND_TCP | LANDLOCK_ACCESS_NET_CONNECT_TCP,
+    if (abi >= 4) {
+      ruleset_attr.handled_access_net =
+          LANDLOCK_ACCESS_NET_BIND_TCP | LANDLOCK_ACCESS_NET_CONNECT_TCP;
+    }
 #endif
-    };
 
     auto ruleset_fd = ::syscall(
         SYS_landlock_create_ruleset, &ruleset_attr, sizeof(ruleset_attr), 0);

diff --git a/examples/kusama/kusama.json b/examples/kusama/kusama.json
@@ -37,7 +37,8 @@
     "/dns/ibp-boot-kusama.luckyfriday.io/tcp/30333/p2p/12D3KooW9vu1GWHBuxyhm7rZgD3fhGZpNajPXFexadvhujWMgwfT",
     "/dns/boot-kusama.luckyfriday.io/tcp/443/wss/p2p/12D3KooWS1Lu6DmK8YHSvkErpxpcXmk14vG6y4KVEFEkd9g62PP8",
     "/dns/ibp-boot-kusama.luckyfriday.io/tcp/30334/wss/p2p/12D3KooW9vu1GWHBuxyhm7rZgD3fhGZpNajPXFexadvhujWMgwfT",
-    "/dns4/kusama-0.boot.onfinality.io/tcp/27682/ws/p2p/12D3KooWFrwFo7ry3dEuFwhehGSSN96a5Xdzxot7SWfXeSbhELAe"
+    "/dns4/kusama-0.boot.onfinality.io/tcp/27682/ws/p2p/12D3KooWFrwFo7ry3dEuFwhehGSSN96a5Xdzxot7SWfXeSbhELAe",
+    "/dns/kusama.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWJHhnF64TXSmyxNkhPkXAHtYNRy86LuvGQu1LTi5vrJCL"
   ],
   "telemetryEndpoints": [
     [
@@ -3483,4 +3484,4 @@
       {}
     ]
   }
-}
+}
diff --git a/examples/paseo/paseo.json b/examples/paseo/paseo.json
@@ -20,7 +20,8 @@
     "/dns/pso16.rotko.net/tcp/33246/p2p/12D3KooWRH8eBMhw8c7bucy6pJfy94q4dKpLkF3pmeGohHmemdRu",
     "/dns/pso16.rotko.net/tcp/35246/wss/p2p/12D3KooWRH8eBMhw8c7bucy6pJfy94q4dKpLkF3pmeGohHmemdRu",
     "/dns/paseo-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWBLLFKDGBxCwq3QmU3YwWKXUx953WwprRshJQicYu4Cfr",
-    "/dns/paseo-boot-ng.dwellir.com/tcp/30354/p2p/12D3KooWBLLFKDGBxCwq3QmU3YwWKXUx953WwprRshJQicYu4Cfr"
+    "/dns/paseo-boot-ng.dwellir.com/tcp/30354/p2p/12D3KooWBLLFKDGBxCwq3QmU3YwWKXUx953WwprRshJQicYu4Cfr",
+    "/dns/paseo.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWMdND5nwfCs5M2rfp5kyRo41BGDgD8V67rVRaB3acgZ53"
   ],
   "telemetryEndpoints": null,
   "protocolId": "pas",
@@ -423,4 +424,4 @@
       "childrenDefault": {}
     }
   }
-}
+}
diff --git a/examples/polkadot/polkadot.json b/examples/polkadot/polkadot.json
diff --git a/examples/rococo/rococo.json b/examples/rococo/rococo.json
@@ -206,4 +206,4 @@
       "childrenDefault": {}
     }
   }
-}
+}
diff --git a/examples/westend/westend.json b/examples/westend/westend.json
@@ -33,7 +33,8 @@
     "/dns/wnd14.rotko.net/tcp/35234/wss/p2p/12D3KooWLK8Zj1uZ46phU3vQwiDVda8tB76S8J26rXZQLHpwWkDJ",
     "/dns/wnd14.rotko.net/tcp/33234/p2p/12D3KooWLK8Zj1uZ46phU3vQwiDVda8tB76S8J26rXZQLHpwWkDJ",
     "/dns/ibp-boot-westend.luckyfriday.io/tcp/30333/p2p/12D3KooWDg1YEytdwFFNWroFj6gio4YFsMB3miSbHKgdpJteUMB9",
-    "/dns/ibp-boot-westend.luckyfriday.io/tcp/30334/wss/p2p/12D3KooWDg1YEytdwFFNWroFj6gio4YFsMB3miSbHKgdpJteUMB9"
+    "/dns/ibp-boot-westend.luckyfriday.io/tcp/30334/wss/p2p/12D3KooWDg1YEytdwFFNWroFj6gio4YFsMB3miSbHKgdpJteUMB9",
+    "/dns/westend.bootnode.stkd.io/tcp/30633/wss/p2p/12D3KooWHaQKkJiTPqeNgqDcW7dfYgJxYwT8YqJMtTkueSu6378V"
   ],
   "telemetryEndpoints": [
     [
@@ -153,4 +154,4 @@
       "childrenDefault": {}
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -206,4 +206,4 @@ @@
           "childrenDefault": {}
         }
       }
-    }
+    }