From ec458a0a08a39affffd4dcfaa8772c48a861cda1 Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:53:55 -0500
Subject: [PATCH] fix: Security Issues (#3530)

Co-authored-by: boc-the-git <3479092+boc-the-git@users.noreply.github.com>
---
 frontend/lib/api/user/users.ts        |  8 +-------
 frontend/nuxt.config.js               |  1 +
 frontend/pages/user/profile/index.vue | 15 +--------------
 mealie/routes/auth/auth.py            |  6 ++++++
 mealie/routes/users/crud.py           | 13 +------------
 mealie/schema/user/user.py            |  2 +-
 tests/utils/api_routes/__init__.py    |  2 --
 7 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/frontend/lib/api/user/users.ts b/frontend/lib/api/user/users.ts
index 9da932e8a84..a9dc3c4639a 100644
--- a/frontend/lib/api/user/users.ts
+++ b/frontend/lib/api/user/users.ts
@@ -1,10 +1,9 @@
 import { BaseCRUDAPI } from "../base/base-clients";
 import { QueryValue, route } from "~/lib/api/base/route";
-import { PaginationData, RequestResponse } from "~/lib/api/types/non-generated";
+import { PaginationData } from "~/lib/api/types/non-generated";
 import {
   ChangePassword,
   DeleteTokenResponse,
-  GroupInDB,
   LongLiveTokenIn,
   LongLiveTokenOut,
   ResetPassword,
@@ -30,7 +29,6 @@ const routes = {
   groupUsers: `${prefix}/users/group-users`,
   usersSelf: `${prefix}/users/self`,
   ratingsSelf: `${prefix}/users/self/ratings`,
-  groupsSelf: `${prefix}/users/self/group`,
   passwordReset: `${prefix}/users/reset-password`,
   passwordChange: `${prefix}/users/password`,
   users: `${prefix}/users`,
@@ -57,10 +55,6 @@ export class UserApi extends BaseCRUDAPI<UserIn, UserOut, UserBase> {
     return await this.requests.get<PaginationData<UserSummary>>(route(routes.groupUsers, { page, perPage, ...params }));
   }
 
-  async getSelfGroup(): Promise<RequestResponse<GroupInDB>> {
-    return await this.requests.get(routes.groupsSelf, {});
-  }
-
   async addFavorite(id: string, slug: string) {
     return await this.requests.post(routes.usersIdFavoritesSlug(id, slug), {});
   }
diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js
index b27bed70b9c..6954d248d3b 100644
--- a/frontend/nuxt.config.js
+++ b/frontend/nuxt.config.js
@@ -156,6 +156,7 @@ export default {
             propertyName: "access_token",
           },
           refresh: { url: "api/auth/refresh", method: "post" },
+          logout: { url: "api/auth/logout", method: "post" },
           user: { url: "api/users/self", method: "get" },
         },
       },
diff --git a/frontend/pages/user/profile/index.vue b/frontend/pages/user/profile/index.vue
index 24a4e0f38a2..e7057216622 100644
--- a/frontend/pages/user/profile/index.vue
+++ b/frontend/pages/user/profile/index.vue
@@ -190,7 +190,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, useContext, ref, toRefs, reactive, useAsync, useRoute } from "@nuxtjs/composition-api";
-import { invoke, until } from "@vueuse/core";
 import UserProfileLinkCard from "@/components/Domain/User/UserProfileLinkCard.vue";
 import { useUserApi } from "~/composables/api";
 import { validators } from "~/composables/use-validators";
@@ -198,7 +197,7 @@ import { alert } from "~/composables/use-toast";
 import UserAvatar from "@/components/Domain/User/UserAvatar.vue";
 import { useAsyncKey } from "~/composables/use-utils";
 import StatsCards from "~/components/global/StatsCards.vue";
-import { GroupInDB, UserOut } from "~/lib/api/types/user";
+import { UserOut } from "~/lib/api/types/user";
 
 export default defineComponent({
   name: "UserProfile",
@@ -216,7 +215,6 @@ export default defineComponent({
 
     // @ts-ignore $auth.user is typed as unknown, but it's a user
     const user = computed<UserOut | null>(() => $auth.user);
-    const group = ref<GroupInDB | null>(null);
 
     const showPublicLink = ref(false);
     const publicLink = ref("");
@@ -225,16 +223,6 @@ export default defineComponent({
     const token = ref("");
     const api = useUserApi();
 
-    invoke(async () => {
-      await until(user.value).not.toBeNull();
-      if (!user.value) {
-        return;
-      }
-
-      const { data } = await api.users.getSelfGroup();
-      group.value = data;
-    });
-
     async function getSignupLink() {
       const { data } = await api.groups.createInvitation({ uses: 1 });
       if (data) {
@@ -333,7 +321,6 @@ export default defineComponent({
       getStatsTitle,
       getStatsIcon,
       getStatsTo,
-      group,
       stats,
       user,
       constructLink,
diff --git a/mealie/routes/auth/auth.py b/mealie/routes/auth/auth.py
index d78c8b7cd30..296884f951c 100644
--- a/mealie/routes/auth/auth.py
+++ b/mealie/routes/auth/auth.py
@@ -72,3 +72,9 @@ async def refresh_token(current_user: PrivateUser = Depends(get_current_user)):
     """Use a valid token to get another token"""
     access_token = security.create_access_token(data=dict(sub=str(current_user.id)))
     return MealieAuthToken.respond(access_token)
+
+
+@user_router.post("/logout")
+async def logout(response: Response):
+    response.delete_cookie("mealie.access_token")
+    return {"message": "Logged out"}
diff --git a/mealie/routes/users/crud.py b/mealie/routes/users/crud.py
index 7c3a8b3601a..1367e0959ad 100644
--- a/mealie/routes/users/crud.py
+++ b/mealie/routes/users/crud.py
@@ -11,14 +11,7 @@
 from mealie.schema.response import ErrorResponse, SuccessResponse
 from mealie.schema.response.pagination import PaginationQuery
 from mealie.schema.user import ChangePassword, UserBase, UserIn, UserOut
-from mealie.schema.user.user import (
-    GroupInDB,
-    UserPagination,
-    UserRatings,
-    UserRatingSummary,
-    UserSummary,
-    UserSummaryPagination,
-)
+from mealie.schema.user.user import UserPagination, UserRatings, UserRatingSummary, UserSummary, UserSummaryPagination
 
 user_router = UserAPIRouter(prefix="/users", tags=["Users: CRUD"])
 admin_router = AdminAPIRouter(prefix="/users", tags=["Users: Admin CRUD"])
@@ -100,10 +93,6 @@ def get_logged_in_user_rating_for_recipe(self, recipe_id: UUID4):
     def get_logged_in_user_favorites(self):
         return UserRatings(ratings=self.repos.user_ratings.get_by_user(self.user.id, favorites_only=True))
 
-    @user_router.get("/self/group", response_model=GroupInDB)
-    def get_logged_in_user_group(self):
-        return self.group
-
     @user_router.put("/password")
     def update_password(self, password_change: ChangePassword):
         """Resets the User Password"""
diff --git a/mealie/schema/user/user.py b/mealie/schema/user/user.py
index 19ba5128a21..3ca7df1e4b1 100644
--- a/mealie/schema/user/user.py
+++ b/mealie/schema/user/user.py
@@ -206,7 +206,7 @@ class UpdateGroup(GroupBase):
 
 
 class GroupInDB(UpdateGroup):
-    users: list[UserOut] | None = None
+    users: list[UserSummary] | None = None
     preferences: ReadGroupPreferences | None = None
     webhooks: list[ReadWebhook] = []
 
diff --git a/tests/utils/api_routes/__init__.py b/tests/utils/api_routes/__init__.py
index 88fe583ab99..65b7e35449b 100644
--- a/tests/utils/api_routes/__init__.py
+++ b/tests/utils/api_routes/__init__.py
@@ -183,8 +183,6 @@
 """`/api/users/self`"""
 users_self_favorites = "/api/users/self/favorites"
 """`/api/users/self/favorites`"""
-users_self_group = "/api/users/self/group"
-"""`/api/users/self/group`"""
 users_self_ratings = "/api/users/self/ratings"
 """`/api/users/self/ratings`"""
 utils_download = "/api/utils/download"