Merge branch 'release/0.3.4'

Author: thelicato

Dockerfile

@@ -83,7 +83,7 @@ RUN curl -o platform-tools.zip https://dl.google.com/android/repository/platform
 RUN pip3 install frida-tools==13.7.1
 RUN npm ci --only=production --ignore-scripts
 # If I don't do this the binding is missing
-RUN npm i frida
+RUN npm rebuild frida
 RUN chmod +x run.sh
 
 ENTRYPOINT ["./run.sh"]

README.md

@@ -117,6 +117,8 @@ The usage of the `DROIDGROUND_NUM_TEAMS` variable slightly changes the behaviour
 
 This allows to share the same DroidGround instance with multiple teams in challenges where the flag can be exfiltrated via a network request. This **massively reduces deploy costs of DroidGround** for CTF competitions.
 
+Furthermore, if the value is set to `-1` it will enable the so-called **Unlimited Teams** mode. In this mode a button to generate a new **_team token_** will be available in the _Overview_ page. All the `DROIDGROUND_TEAM_TOKEN_<N>` variables are ignored if this mode is enabled.
+
 ## 🧩 Use Cases
 
 Here are some ways DroidGround can be used:
@@ -181,10 +183,17 @@ After that you may just run the following:
 ```sh
 git clone https://github.com/SECFORCE/droidground.git
 cd droidground
-npm run install
-```
 
-There is a `postinstall` script which will also try to build it, so if something's missing you'll know pretty soon.
+# Install without running scripts
+npm install --ignore-scripts
+# Rebuild frida to get the bindings
+npm rebuild frida
+# Build companion app
+npm run companion
+# Get scrcpy
+npx fetch-scrcpy-server 3.1
+npm run scrcpy
+```
 
 After that you just need to set the **env** variables and then run `npm run dev` and you'll be good to go. Happy dev mode!
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "droidground",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "type": "module",
   "author": "Angelo Delicato",
   "scripts": {

package.json

@@ -10,6 +10,7 @@ import {
   GetFilesRequest,
   GetFilesResponse,
   IGenericResultRes,
+  NewTeamResponse,
   StartActivityRequest,
   StartBroadcastRequest,
   StartExploitAppRequest,
@@ -122,6 +123,11 @@ class RESTManager {
     return res;
   }
 
+  async addNewTeam(): Promise<AxiosResponse<NewTeamResponse>> {
+    const res = await http.post<NewTeamResponse>(E.NEW_TEAM);
+    return res;
+  }
+
   async getAttackSurface(debugToken: string): Promise<AxiosResponse<CompanionAttackSurface>> {
     const res = await http.get<CompanionAttackSurface>(E.ATTACK_SURFACE, { headers: { Authorization: debugToken } });
     return res;

src/client/api/rest.ts

@@ -0,0 +1,71 @@
+import { useEffect, useState } from "react";
+import toast from "react-hot-toast";
+import { RESTManagerInstance } from "@client/api/rest";
+
+interface IModalProps {
+  dialogRef: React.RefObject<HTMLDialogElement | null>;
+}
+
+export const AddNewTeamModal: React.FC<IModalProps> = ({ dialogRef }) => {
+  const [requestResult, setRequestResult] = useState<string>("");
+
+  useEffect(() => {
+    const handleClose = () => {
+      setRequestResult("");
+    };
+
+    const dialog = dialogRef.current;
+    if (dialog) {
+      dialog.addEventListener("close", handleClose);
+    }
+
+    return () => {
+      if (dialog) {
+        dialog.removeEventListener("close", handleClose);
+      }
+    };
+  }, []);
+
+  const getTeamToken = async () => {
+    try {
+      const res = await RESTManagerInstance.addNewTeam();
+      setRequestResult(`New Team Token generated: ${res.data.teamToken}`);
+    } catch (e) {
+      console.error(e);
+      toast.error("Error while generating new Team Token.");
+    }
+  };
+
+  return (
+    <dialog ref={dialogRef} className="modal">
+      <div className="modal-box max-w-3xl">
+        <h3 className="font-bold text-lg mb-4">Get Team Token</h3>
+        <p className="mb-4">
+          This will allow you to get a new Team Token which is <b>required</b> to install and run <i>exploit apps</i>{" "}
+          and for the <i>Exploit Server</i> as well.
+        </p>
+        <div className="space-y-4">
+          {/* Result */}
+          {requestResult.length > 0 && (
+            <div className="flex flex-col justify-between mb-4 gap-4">
+              <span className="font-semibold">Output</span>
+              <div className="mockup-code w-full hide-before max-h-96 overflow-y-auto p-4">
+                <pre className="text-accent text-wrap wrap-break-word break-all">
+                  <code>{requestResult}</code>
+                </pre>
+              </div>
+            </div>
+          )}
+
+          {/* Submit */}
+          <div className="flex justify-end">
+            <input onClick={getTeamToken} className="btn btn-primary" value="Get Token" />
+          </div>
+        </div>
+      </div>
+      <form method="dialog" className="modal-backdrop">
+        <button>close</button>
+      </form>
+    </dialog>
+  );
+};

src/client/components/AddNewTeamModal.tsx

@@ -4,3 +4,4 @@ export { StartBroadcastModal } from "@client/components/StartBroadcastModal";
 export { StartServiceModal } from "@client/components/StartServiceModal";
 export { InstallExploitAppModal } from "@client/components/InstallExploitAppModal";
 export { StartExploitAppModal } from "@client/components/StartExploitAppModal";
+export { AddNewTeamModal } from "@client/components/AddNewTeamModal";

src/client/components/index.ts

@@ -154,7 +154,13 @@ const Navbar: React.FC = () => {
               .filter(i => i.routeEnabled)
               .map(item => (
                 <li key={item.to}>
-                  <button className="justify-between" onClick={() => navigate(item)}>
+                  <button
+                    className="justify-between"
+                    onClick={() => {
+                      (document.activeElement as HTMLElement | null)?.blur();
+                      navigate(item);
+                    }}
+                  >
                     {item.label}
                   </button>
                 </li>

src/client/layout/Header.tsx

@@ -7,7 +7,7 @@ import { MdSpaceDashboard } from "react-icons/md";
 import { RESTManagerInstance } from "@client/api/rest";
 import { BugreportzStatusResponse } from "@shared/api";
 import { useAPI } from "@client/context/API";
-import { StartActivityModal, StartBroadcastModal, StartServiceModal } from "@client/components";
+import { AddNewTeamModal, StartActivityModal, StartBroadcastModal, StartServiceModal } from "@client/components";
 
 export const Overview: React.FC = () => {
   const { featuresConfig, deviceInfo } = useAPI();
@@ -17,6 +17,7 @@ export const Overview: React.FC = () => {
   });
   const isPowerMenuEnabled = featuresConfig.shutdownEnabled || featuresConfig.rebootEnabled;
   // Dialogs
+  const addNewTeamDialogRef = useRef<HTMLDialogElement | null>(null);
   const startActivityDialogRef = useRef<HTMLDialogElement | null>(null);
   const startBroadcastReceiverDialogRef = useRef<HTMLDialogElement | null>(null);
   const startServiceDialogRef = useRef<HTMLDialogElement | null>(null);
@@ -120,6 +121,9 @@ export const Overview: React.FC = () => {
        *    Modals   *
        ***************/}
 
+      {/* New Team Modal */}
+      <AddNewTeamModal dialogRef={addNewTeamDialogRef} />
+
       {/* Start Activity Modal */}
       <StartActivityModal dialogRef={startActivityDialogRef} />
 
@@ -202,6 +206,22 @@ export const Overview: React.FC = () => {
               </div>
             </div>
 
+            {featuresConfig.unlimitedTeams && (
+              <div className="flex w-full justify-between items-center">
+                <p>
+                  Get <b>Team Token</b>
+                </p>
+                <div className="join">
+                  <button
+                    className="btn btn-info join-item rounded-r-md"
+                    onClick={() => addNewTeamDialogRef.current?.showModal()}
+                  >
+                    Get
+                  </button>
+                </div>
+              </div>
+            )}
+
             {featuresConfig.startActivityEnabled && (
               <div className="flex w-full justify-between items-center">
                 <p>

src/client/views/Overview.tsx

@@ -20,6 +20,7 @@ import {
   GetFilesResponse,
   IGenericErrRes,
   IGenericResultRes,
+  NewTeamResponse,
   StartActivityRequest,
   StartBroadcastRequest,
   StartExploitAppRequest,
@@ -70,6 +71,19 @@ class APIController {
     }
   };
 
+  newTeam: RequestHandler = async (req: Request, res: Response<NewTeamResponse | IGenericErrRes>) => {
+    Logger.info(`Received ${req.method} request on ${req.path}`);
+    try {
+      const singleton = ManagerSingleton.getInstance();
+      const teamToken = singleton.addTeam();
+
+      res.json({ teamToken }).end();
+    } catch (error: any) {
+      Logger.error(`Error generating new Team Token: ${error}`);
+      res.status(500).json({ error: "An error occurred while generating a new Team Token" }).end();
+    }
+  };
+
   restartApp: RequestHandler = async (req: Request, res: Response<IGenericResultRes | IGenericErrRes>) => {
     Logger.info(`Received ${req.method} request on ${req.path}`);
     try {