Merge pull request fortran-lang#78 from henilp105/main

fix: bugs detected in current release

.github/workflows/security_checks.yml

@@ -18,8 +18,9 @@ jobs:
 
       - uses: fortran-lang/setup-fpm@v5
         with:
-          fpm-version: 'v0.10.1'
-          github-token: ${{ secrets.GITHUB_TOKEN }}     
+          fpm-version: 'v0.10.2'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          fpm-repository: https://github.com/henilp105/fpm     
 
       - name: Setup Python
         uses: actions/setup-python@v5

backend/models/namespace.py

@@ -9,7 +9,7 @@ def __init__(self, namespace, description, author, maintainers=[], admins=[], pa
         self.author = author
         self.maintainers = maintainers
         self.admins = admins
-        self.packages = []
+        self.packages = packages
 
     # Create a to_json method.
     def to_json(self):

backend/namespaces.py

@@ -171,7 +171,7 @@ def namespace_packages(namespace):
                 "name": 1,
                 "description": 1,
                 "author": 1,
-                "updatedAt": 1,
+                "updated_at": 1,
             },
         )
 
@@ -185,7 +185,7 @@ def namespace_packages(namespace):
             "name": package["name"],
             "description": package["description"],
             "author": author_obj.username,
-            "updatedAt": package["updatedAt"],
+            "updated_at": package["updated_at"],
         })
 
     return (
@@ -201,30 +201,14 @@ def namespace_packages(namespace):
 
 @app.route("/namespaces/<namespace>/admins", methods=["POST"])
 @swag_from("documentation/get_namespace_admins.yaml", methods=["POST"])
-@jwt_required()
 def namespace_admins(namespace):
-    uuid = get_jwt_identity()
-
-    if not uuid:
-        return jsonify({"code": 401, "message": "Unauthorized"}), 401
-
-    user = db.users.find_one({"uuid": uuid})
-
-    if not user:
-        return jsonify({"code": 404, "message": "User not found"}), 404
-
-    user_obj = User.from_json(user)
-
     namespace_doc = db.namespaces.find_one({"namespace": namespace})
 
     if not namespace_doc:
         return jsonify({"code": 404, "message": "Namespace not found"}), 404  
 
     namespace_obj = Namespace.from_json(namespace_doc)
 
-    if not user_obj.id in namespace_obj.admins and not user_obj.id in namespace_obj.maintainers:
-        return jsonify({"code": 401, "message": "Unauthorized"}), 401
-
     admins = []
 
     for i in namespace_obj.admins:
@@ -239,28 +223,14 @@ def namespace_admins(namespace):
 
 @app.route("/namespaces/<namespace>/maintainers", methods=["POST"])
 @swag_from("documentation/get_namespace_maintainers.yaml", methods=["POST"])
-@jwt_required()
 def namespace_maintainers(namespace):
-    uuid = get_jwt_identity()
-
-    if not uuid:
-        return jsonify({"code": 401, "message": "Unauthorized"}), 401
-
-    user = db.users.find_one({"uuid": uuid})
-
-    if not user:
-        return jsonify({"code": 404, "message": "User not found"}), 404
 
     namespace_doc = db.namespaces.find_one({"namespace": namespace})
 
     if not namespace_doc:
         return jsonify({"code": 404, "message": "Namespace not found"}), 404
 
     namespace_obj = Namespace.from_json(namespace_doc)
-    user_obj = User.from_json(user)
-
-    if not user_obj.id in namespace_obj.admins and not user_obj.id in namespace_obj.maintainers:
-        return jsonify({"code": 401, "message": "Unauthorized"}), 401    
 
     maintainers = []
 

backend/packages.py

@@ -837,18 +837,9 @@ def create_token_upload_token_package(namespace_name, package_name):
     )
 
 
-@app.route("/packages/<namespace>/<package>/maintainers", methods=["GET"])
-@swag_from("documentation/package_maintainers.yaml", methods=["GET"])
-@jwt_required()
+@app.route("/packages/<namespace>/<package>/maintainers", methods=["GET","POST"])
+@swag_from("documentation/package_maintainers.yaml", methods=["GET","POST"])
 def package_maintainers(namespace, package):
-    uuid = get_jwt_identity()
-
-    user = db.users.find_one({"uuid": uuid})
-
-    if not user:
-        return jsonify({"code": 401, "message": "Unauthorized"}), 401
-
-    user_obj = User.from_json(user)
 
     namespace_doc = db.namespaces.find_one({"namespace": namespace})
 

backend/requirements.txt

@@ -10,4 +10,5 @@ semantic-version
 docker
 toml
 flask-jwt-extended
-numpy
+numpy
+markdown

backend/user.py

@@ -76,7 +76,7 @@ def profile(username):
                         "name": package_doc["name"],
                         "namespace": namespace["namespace"],
                         "description": package_doc["description"],
-                        "updatedAt": package_doc["updated_at"],
+                        "updated_at": package_doc["updated_at"],
                         "isNamespaceMaintainer": isNamespaceMaintainer,
                         "isNamespaceAdmin": isNamespaceAdmin,
                         "isPackageMaintainer": isPackageMaintainer,
@@ -119,7 +119,7 @@ def profile(username):
                         "name": package["name"],
                         "namespace": namespace["namespace"],
                         "description": package["description"],
-                        "updatedAt": package["updated_at"],
+                        "updated_at": package["updated_at"],
                         "isNamespaceMaintainer": isNamespaceMaintainer,
                         "isPackageMaintainer": isPackageMaintainer,
                     }
@@ -149,8 +149,9 @@ def profile(username):
 
 @app.route("/users/delete", methods=["POST"])
 @swag_from("documentation/delete_user.yaml", methods=["POST"])
+@jwt_required()
 def delete_user():
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username = request.form.get("username")
 
     if not uuid:
@@ -173,8 +174,9 @@ def delete_user():
 
 @app.route("/users/account", methods=["POST"])
 @swag_from("documentation/get_user_account.yaml", methods=["POST"])
+@jwt_required()
 def account():
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     if not uuid:
         return jsonify({"message": "Unauthorized", "code": 401}), 401
     else:
@@ -263,8 +265,9 @@ def transfer_account():
 
 @app.route("/<username>/maintainer", methods=["POST"])
 @swag_from("documentation/add_package_maintainer.yaml", methods=["POST"])
+@jwt_required()
 def add_maintainers_to_package(username):
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username_to_be_added = request.form.get("username")
     package = request.form.get("package")
     namespace = request.form.get("namespace")
@@ -344,8 +347,9 @@ def add_maintainers_to_package(username):
 
 @app.route("/<username>/maintainer/remove", methods=["POST"])
 @swag_from("documentation/remove_package_maintainer.yaml", methods=["POST"])
+@jwt_required()
 def remove_maintainers_from_package(username):
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username_to_be_removed = request.form.get("username")
     package = request.form.get("package")
     namespace = request.form.get("namespace")
@@ -430,8 +434,9 @@ def remove_maintainers_from_package(username):
 
 @app.route("/<username>/namespace/maintainer", methods=["POST"])
 @swag_from("documentation/add_namespace_maintainer.yaml", methods=["POST"])
+@jwt_required()
 def add_maintainers_to_namespace(username):
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username_to_be_added = request.form.get("username")
     namespace = request.form.get("namespace")
 
@@ -499,8 +504,9 @@ def add_maintainers_to_namespace(username):
 
 @app.route("/<username>/namespace/maintainer/remove", methods=["POST"])
 @swag_from("documentation/remove_namespace_maintainer.yaml", methods=["POST"])
+@jwt_required()
 def remove_maintainers_from_namespace(username):
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username_to_be_removed = request.form.get("username")
     namespace = request.form.get("namespace")
 
@@ -575,8 +581,9 @@ def remove_maintainers_from_namespace(username):
 
 @app.route("/<username>/namespace/admin", methods=["POST"])
 @swag_from("documentation/add_namespace_admin.yaml", methods=["POST"])
+@jwt_required()
 def add_admins_to_namespace(username):
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username_to_be_added = request.form.get("username")
     namespace = request.form.get("namespace")
 
@@ -639,8 +646,9 @@ def add_admins_to_namespace(username):
 
 @app.route("/<username>/namespace/admin/remove", methods=["POST"])
 @swag_from("documentation/remove_namespace_admin.yaml", methods=["POST"])
+@jwt_required()
 def remove_admins_from_namespace(username):
-    uuid = request.form.get("uuid")
+    uuid = get_jwt_identity()
     username_to_be_removed = request.form.get("username")
     namespace = request.form.get("namespace")
 

backend/validate.py

@@ -1,13 +1,15 @@
 from app import app
 import subprocess
 import toml
+import html
 from mongo import db
 from mongo import file_storage
 from bson.objectid import ObjectId
 from gridfs.errors import NoFile
 import toml
 from check_digests import check_digests
 from typing import Union,List, Tuple, Dict, Any
+import markdown
 
 
 def run_command(command: str) -> Union[str, None]:
@@ -82,6 +84,13 @@ def process_package(packagename: str) -> Tuple[bool, Union[dict, None], str]:
     cleanup_command = f'rm -rf static/temp/{packagename} static/temp/{packagename}.tar.gz'
     # run_command(cleanup_command)
     print(result)
+
+    if 'description' in parsed_toml and parsed_toml['description'] == "README.md":
+        try:
+            with open(f'static/temp/{packagename}/README.md', 'r') as file:
+                parsed_toml['description'] = markdown.markdown(file.read())  # Sanitize HTML content
+        except:
+            parsed_toml['description'] = "README.md not found."
 
     if result[0]==-1:
         # Package verification failed 

frontend/src/components/packageItem.js

@@ -55,7 +55,12 @@ const PackageItem = ({ packageEntity }) => {
           </Link>
 
           <h6 className="mb-2 text-muted">
-            Namespace {packageEntity.namespace}
+              <a
+                href={`/namespaces/${packageEntity.namespace}`}
+                  style={{ textDecoration: "none" }}
+                >
+                Namespace  {packageEntity.namespace}
+                </a>
           </h6>
           <label className="mb-2 text-muted" style={{ fontSize: "18px" }}>
             {packageEntity.description}

frontend/src/pages/namespace.js

@@ -51,9 +51,10 @@ const NamespacePage = () => {
           <Row
             style={{ marginLeft: "10px", marginTop: "10px", fontSize: "20px" }}
           >
-            <MDBIcon style={{ marginTop: "5px" }} fas icon="box">
+            <MDBIcon style={{ marginTop: "5px" }} far icon="box">
               {" Namespace: " + namespace}
             </MDBIcon>
+            <br></br>
             <MDBIcon style={{ marginTop: "5px" }} far icon="calendar-alt">
               {" Created " + dateJoined.slice(4, 16)}
             </MDBIcon>
@@ -68,7 +69,7 @@ const NamespacePage = () => {
           >
             <MDBIcon
               style={{ marginTop: "5px" }}
-              fas
+              far
               icon="user"
               onClick={() => {
                 setFindNamespaceMaintainers(false);
@@ -90,7 +91,7 @@ const NamespacePage = () => {
           >
             <MDBIcon
               style={{ marginTop: "5px" }}
-              fas
+              far
               icon="user"
               onClick={() => {
                 setFindNamespaceMaintainers(true);

frontend/src/pages/package.js

@@ -61,7 +61,13 @@ const PackagePage = () => {
           justifyContent: "space-between",
         }}
       >
-        <p style={{ textAlign: "left", fontSize: 24 }}>{data.name}</p>
+        <p style={{ textAlign: "left", fontSize: 24 }}><a
+        href={`/namespaces/${data.namespace}`}
+          style={{ textDecoration: "none" }}
+        >
+        {data.namespace}
+        </a>
+        /{data.name}</p>
 
         <ViewPackageMaintainersButton
           namespace_name={namespace_name}

frontend/src/pages/showUserListDialog.js

@@ -69,7 +69,13 @@ const ShowUserListDialog = (props) => {
                         marginBottom: "0",
                       }}
                     >
-                      {user.username}
+
+                    <a
+                        href={`/users/${user.username}`}
+                        style={{ textDecoration: "none" }}
+                      >
+                        {user.username}
+                      </a>
                     </h6>
                   </Card.Body>
                 </Card>