ramm 0.0.24 → 0.0.26

package/dist/ramm.js

@@ -171,6 +171,10 @@ var installPodman = async () => {
 };
 var createNetwork = async () => {
   const netwroks = await execCommand("podman network inspect $(podman network ls -q) -f '{{.NetworkInterface}}'");
+  const podmanNetworks = await execCommand("podman network ls");
+  if (podmanNetworks.output.includes("ramm")) {
+    return;
+  }
   if (netwroks.output.includes("podman_ramm")) {
     return;
   }
@@ -208,22 +212,27 @@ var addNftPodmanRule = async () => {
   await execCommand("nft insert rule inet ramm prerouting iifname @podman_interfaces accept");
 };
 // src/nft.ts
-var createNftTable = (allowed_ssh_ipv4) => {
+var createNftTable = ({ allowedIpV4 }) => {
   const nftTable = `table inet ramm {
-    set allowed_ssh_ipv4 {
+    set allowed_ipv4 {
       type ipv4_addr
       flags dynamic
-      elements = { ${allowed_ssh_ipv4} }
+      elements = { ${allowedIpV4.join(`
+	`)} }
     }
 
-    chain local_chain {
-      iif "lo" accept 
+    chain local_chain_base {
+      iif "lo" accept
       ct state established,related accept
-      ip saddr @allowed_ssh_ipv4 tcp dport 22 accept
+      ip saddr @allowed_ipv4 tcp dport 22 accept
       tcp dport 22 ct state new limit rate over 700/minute burst 5 packets drop
       tcp dport 22 accept
       tcp dport 80 accept
       tcp dport 443 accept
+    }
+
+    chain local_chain {
+      jump local_chain_base
       drop
     }
 
@@ -235,12 +244,14 @@ var createNftTable = (allowed_ssh_ipv4) => {
   `;
   return nftTable;
 };
-var setupNftable = async (allowedIpSsh) => {
+var setupNftable = async ({
+  allowedIpV4
+}) => {
   const listTable = await execCommand("nft list table inet ramm");
   if (listTable.spawnResult.exitCode === 0) {
     await execCommand("nft delete table inet ramm");
   }
-  const nftTable = createNftTable(allowedIpSsh);
+  const nftTable = createNftTable({ allowedIpV4 });
   await execCommand(`nft -f - <<EOF
 ${nftTable}
 EOF`);
@@ -319,7 +330,7 @@ var writeFile = async (pathToFile, str) => {
   debugApiCall(`write(${normalizedPath})`);
   await write(normalizedPath, str);
 };
-var writeFileIfNotMatch = async (pathToFile, str) => {
+var writeIfNewCompletely = async (pathToFile, str) => {
   const normalizedPath = normalizePath(pathToFile);
   await createFileIfNeed(normalizedPath);
   debugApiCall(`file(${normalizedPath}).text()`);
@@ -361,7 +372,7 @@ async function createSshKey(pathToKey, comment) {
   const pubKey = await Bun.file(pathToKeyPub).text();
   return pubKey;
 }
-var addSshKey = async (pubKey, context) => {
+var addSshKeyToAuthorized = async (pubKey, context) => {
   const { output: keys } = await execBySsh("cat .ssh/authorized_keys", context);
   if (keys.includes(pubKey)) {
     return;
@@ -371,7 +382,7 @@ var addSshKey = async (pubKey, context) => {
 var createAndAddSshKey = async (pathToKey, comment, context) => {
   const pubKey = await createSshKey(pathToKey, comment);
   debug(`Key is: ${pubKey}`);
-  await addSshKey(pubKey, context);
+  await addSshKeyToAuthorized(pubKey, context);
 };
 // src/cron.ts
 var createCron = async ({
@@ -433,7 +444,7 @@ var passVarsServer = async () => {
 };
 export {
   writeIfNew,
-  writeFileIfNotMatch,
+  writeIfNewCompletely as writeFileIfNotMatch,
   writeFile,
   setupNftable,
   runPodmanContainerService,

package/dist/types/files.d.ts

@@ -1,4 +1,4 @@
 export declare const normalizeFileContent: (str: string) => string;
 export declare const writeIfNew: (rawFilePath: string, str: string) => Promise<void>;
 export declare const writeFile: (pathToFile: string, str: string) => Promise<void>;
-export declare const writeFileIfNotMatch: (pathToFile: string, str: string) => Promise<void>;
+export declare const writeIfNewCompletely: (pathToFile: string, str: string) => Promise<void>;

package/dist/types/nft.d.ts

@@ -1,2 +1,4 @@
 export declare const localNftChainName = "local_chain";
-export declare const setupNftable: (allowedIpSsh: string) => Promise<void>;
+export declare const setupNftable: ({ allowedIpV4, }: {
+    allowedIpV4: string[];
+}) => Promise<void>;

package/dist/types/ramm.d.ts

@@ -7,7 +7,7 @@ export { restartSystemdService } from "./systemd.ts";
 export { installSystemPackage } from "./packages.ts";
 export { debugBlock } from "./debug.ts";
 export { setupNftable } from "./nft.ts";
-export { writeIfNew, writeFile, writeFileIfNotMatch, normalizeFileContent, } from "./files.ts";
+export { writeIfNew, writeFile, writeIfNewCompletely as writeFileIfNotMatch, normalizeFileContent, } from "./files.ts";
 export { createAndAddSshKey, getServerFingerprintBySsh, addKeyToHostConfig, } from "./ssh.ts";
 export { normalizePath } from "./path.ts";
 export { createCron } from "./cron.ts";

package/dist/types/ssh.d.ts

@@ -2,3 +2,9 @@ import type { Context } from "./context.ts";
 export declare const addKeyToHostConfig: (pathToHost: string, address: string, pathToKey: string) => Promise<void>;
 export declare const getServerFingerprintBySsh: (context: Context) => Promise<string>;
 export declare const createAndAddSshKey: (pathToKey: string, comment: string, context: Context) => Promise<void>;
+export declare const setupSshKey: ({ key, fingerprint, pathToFile, server, }: {
+    key: string;
+    fingerprint: string;
+    pathToFile: string;
+    server: string;
+}) => Promise<void>;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "ramm",
   "type": "module",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "scripts": {
-    "build": "bun build ./src/ramm.ts --target bun --outdir ./dist && cp ./src/bun.sh ./dist/bun.sh && bun run types",
+    "build": "bun build ./src/ramm.ts --target bun --outdir ./dist && cp ./src/bun.sh ./dist/bun.sh",
     "types": "tsc --project tsconfig.types.json"
   },
   "main": "dist/ramm.js",
@@ -19,6 +19,7 @@
     "typescript": "^5.8.2"
   },
   "dependencies": {
+    "dapes": "^0.0.26",
     "desy": "^0.0.14"
   }
-}
+}