ethyca-fides 2.73.2b0__py2.py3-none-any.whl → 2.76.0rc2__py2.py3-none-any.whl

fides/api/models/taxonomy.py

@@ -17,7 +17,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import RelationshipProperty, Session, relationship
 
-from fides.api.common_exceptions import ValidationError
+from fides.api.common_exceptions import KeyOrNameAlreadyExists, ValidationError
 from fides.api.db.base_class import Base
 from fides.api.models.sql_models import FidesBase  # type: ignore[attr-defined]
 
@@ -254,6 +254,66 @@ class TaxonomyElement(Base, FidesBase):
         remote_side="TaxonomyElement.fides_key",
     )
 
+    @classmethod
+    def create(
+        cls: Type["TaxonomyElement"],
+        db: Session,
+        *,
+        data: dict[str, Any],
+        check_name: bool = True,
+    ) -> "TaxonomyElement":
+        """
+        Override create to skip name uniqueness check for hierarchical taxonomy.
+
+        TaxonomyElement is hierarchical - fides_key provides sufficient uniqueness.
+        Multiple elements can share the same name as long as their keys differ.
+        """
+        # Check if taxonomy element with same fides_key already exists within the same taxonomy_type
+        if "fides_key" in data and data["fides_key"] and "taxonomy_type" in data:
+            existing_by_key = (
+                db.query(cls)
+                .filter(
+                    cls.fides_key == data["fides_key"],
+                    cls.taxonomy_type == data["taxonomy_type"],
+                )
+                .first()
+            )
+            if existing_by_key:
+                raise KeyOrNameAlreadyExists(
+                    f'Taxonomy element with fides_key "{data["fides_key"]}" already exists in taxonomy "{data["taxonomy_type"]}".'
+                )
+        # Always skip name check - fides_key uniqueness is sufficient
+        return super().create(db=db, data=data, check_name=False)
+
+    def update(self, db: Session, *, data: dict[str, Any]) -> "TaxonomyElement":
+        """
+        Override update to check for existing taxonomy elements with the same fides_key
+        within the same taxonomy_type when fides_key is being changed.
+        """
+        # Check if fides_key is being changed and if it conflicts with an existing element
+        if (
+            "fides_key" in data
+            and data["fides_key"]
+            and data["fides_key"] != self.fides_key
+        ):
+            # Ensure taxonomy_type is available (either in data or from self)
+            taxonomy_type = data.get("taxonomy_type") or self.taxonomy_type
+            if taxonomy_type:
+                existing_by_key = (
+                    db.query(TaxonomyElement)
+                    .filter(
+                        TaxonomyElement.fides_key == data["fides_key"],
+                        TaxonomyElement.taxonomy_type == taxonomy_type,
+                        TaxonomyElement.id != self.id,  # Exclude current element
+                    )
+                    .first()
+                )
+                if existing_by_key:
+                    raise KeyOrNameAlreadyExists(
+                        f'Taxonomy element with fides_key "{data["fides_key"]}" already exists in taxonomy "{taxonomy_type}".'
+                    )
+        return super().update(db=db, data=data)  # type: ignore[return-value]
+
 
 class TaxonomyUsage(Base):
     """

fides/api/oauth/roles.py

@@ -16,6 +16,7 @@ from fides.common.api.scope_registry import (
     DATA_USE_READ,
     DATASET_READ,
     EVALUATION_READ,
+    HEAP_DUMP_EXEC,
     MASKING_EXEC,
     MASKING_READ,
     MESSAGING_CREATE_OR_UPDATE,
@@ -145,6 +146,7 @@ not_contributor_scopes = [
     PRIVACY_REQUEST_NOTIFICATIONS_CREATE_OR_UPDATE,
     PRIVACY_REQUEST_EMAIL_INTEGRATIONS_SEND,
     USER_PERMISSION_ASSIGN_OWNERS,
+    HEAP_DUMP_EXEC,
 ]
 
 ROLES_TO_SCOPES_MAPPING: Dict[str, List] = {

fides/api/schemas/connection_configuration/connection_secrets_mssql.py

@@ -39,6 +39,11 @@ class MicrosoftSQLServerSchema(ConnectionConfigSecretsSchema):
         title="Database",
         description="The name of the specific database within the database server that you want to connect to.",
     )
+    read_only_connection: Optional[bool] = Field(
+        default=False,
+        title="Read Only Connection",
+        description="Whether to connect to the database in read-only mode.",
+    )
 
     _required_components: ClassVar[List[str]] = [
         "host",

fides/api/schemas/messaging/messaging.py

@@ -103,6 +103,7 @@ CONFIGURABLE_MESSAGING_ACTION_TYPES: Tuple[str, ...] = (
     MessagingActionType.PRIVACY_REQUEST_REVIEW_DENY.value,
     MessagingActionType.PRIVACY_REQUEST_REVIEW_APPROVE.value,
     MessagingActionType.MANUAL_TASK_DIGEST.value,
+    MessagingActionType.EXTERNAL_USER_WELCOME.value,
 )
 
 

fides/api/schemas/oauth.py

@@ -1,4 +1,4 @@
-from typing import Dict, Optional
+from typing import Dict, Literal, Optional
 
 from fastapi import Form
 from fastapi.openapi.models import OAuthFlows
@@ -14,6 +14,7 @@ class AccessToken(BaseModel):
     """A wrapper for the access_code returned upon successful authentication"""
 
     access_token: str
+    token_type: Literal["Bearer"] = "Bearer"
 
 
 # NOTE: Adapted from

fides/api/schemas/privacy_request.py

@@ -1,9 +1,10 @@
 from datetime import datetime
 from enum import Enum as EnumType
 from typing import Any, Dict, List, Optional, Type, Union
+from uuid import UUID
 
 from fideslang.validation import FidesKey
-from pydantic import ConfigDict, Field, field_serializer, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
 from fides.api.custom_types import SafeStr
 from fides.api.graph.config import CollectionAddress
@@ -13,7 +14,11 @@ from fides.api.schemas.api import BulkResponse, BulkUpdateFailed
 from fides.api.schemas.base_class import FidesSchema
 from fides.api.schemas.policy import ActionType, CurrentStep
 from fides.api.schemas.policy import PolicyResponse as PolicySchema
-from fides.api.schemas.redis_cache import CustomPrivacyRequestField, Identity
+from fides.api.schemas.redis_cache import (
+    CustomPrivacyRequestField,
+    Identity,
+    MultiValue,
+)
 from fides.api.schemas.user import PrivacyRequestUser
 from fides.api.util.collection_util import Row
 from fides.api.util.encryption.aes_gcm_encryption_scheme import verify_encryption_key
@@ -309,6 +314,22 @@ class PrivacyRequestStatus(str, EnumType):
     duplicate = "duplicate"  # Request identified as duplicate of another request
 
 
+class IdentityValue(BaseModel):
+    """Represents an identity value with a label in API responses.
+
+    The value field accepts MultiValue types which match what LabeledIdentity supports:
+    - int
+    - str
+    - List[Union[int, str]]
+
+    This allows the schema to accept list values that were previously causing
+    validation errors.
+    """
+
+    label: str
+    value: Optional[MultiValue] = None
+
+
 class PrivacyRequestResponse(FidesSchema):
     """Schema to check the status of a PrivacyRequest"""
 
@@ -329,7 +350,7 @@ class PrivacyRequestResponse(FidesSchema):
     # as it is an API response field, and we don't want to reveal any more
     # about our PII structure than is explicitly stored in the cache on request
     # creation.
-    identity: Optional[Dict[str, Union[Optional[str], Dict[str, Any]]]] = None
+    identity: Optional[Dict[str, Union[Optional[str], IdentityValue]]] = None
     custom_privacy_request_fields: Optional[Dict[str, Any]] = None
     policy: PolicySchema
     action_required_details: Optional[CheckpointActionRequiredDetails] = None
@@ -343,7 +364,7 @@ class PrivacyRequestResponse(FidesSchema):
     deleted_by: Optional[str] = None
     finalized_at: Optional[datetime] = None
     finalized_by: Optional[str] = None
-    duplicate_request_group_id: Optional[str] = None
+    duplicate_request_group_id: Optional[UUID] = None
 
     model_config = ConfigDict(from_attributes=True, use_enum_values=True)
 
@@ -358,10 +379,15 @@ class PrivacyRequestVerboseResponse(PrivacyRequestResponse):
     model_config = ConfigDict(populate_by_name=True)
 
 
+# Batch size for bulk privacy request operations. Used for request validation and
+# automatic batching to avoid memory issues with large request lists.
+BULK_PRIVACY_REQUEST_BATCH_SIZE = 50
+
+
 class ReviewPrivacyRequestIds(FidesSchema):
     """Pass in a list of privacy request ids"""
 
-    request_ids: List[str] = Field(..., max_length=50)
+    request_ids: List[str] = Field(..., max_length=BULK_PRIVACY_REQUEST_BATCH_SIZE)
 
 
 class DenyPrivacyRequests(ReviewPrivacyRequestIds):
@@ -370,6 +396,12 @@ class DenyPrivacyRequests(ReviewPrivacyRequestIds):
     reason: Optional[SafeStr] = None
 
 
+class CancelPrivacyRequests(ReviewPrivacyRequestIds):
+    """Pass in a list of privacy request ids and cancellation reason"""
+
+    reason: Optional[SafeStr] = None
+
+
 class BulkPostPrivacyRequests(BulkResponse):
     """Schema with mixed success/failure responses for Bulk Create of PrivacyRequest responses."""
 
@@ -458,7 +490,7 @@ class PrivacyRequestFilter(FidesSchema):
     errored_gt: Optional[datetime] = None
     external_id: Optional[str] = None
     location: Optional[str] = None
-    action_type: Optional[ActionType] = None
+    action_type: Optional[Union[ActionType, List[ActionType]]] = None
     verbose: Optional[bool] = False
     include_identities: Optional[bool] = False
     include_custom_privacy_request_fields: Optional[bool] = False

fides/api/schemas/saas/connector_template.py

@@ -4,6 +4,7 @@ from fideslang.models import Dataset
 from pydantic import BaseModel, field_validator
 
 from fides.api.models.datasetconfig import validate_masking_strategy_override
+from fides.api.schemas.base_class import FidesSchema
 from fides.api.schemas.enums.connection_category import ConnectionCategory
 from fides.api.schemas.enums.integration_feature import IntegrationFeature
 from fides.api.schemas.policy import ActionType
@@ -50,3 +51,16 @@ class ConnectorTemplate(BaseModel):
                 "Hard-coded fides_key detected in the dataset, replace all instances of it with <instance_fides_key>"
             )
         return dataset
+
+
+class ConnectorTemplateListResponse(FidesSchema):
+    """
+    Response schema for listing connector templates.
+    Provides summary information about available connector templates.
+    """
+
+    type: str
+    name: str
+    supported_actions: List[ActionType]
+    category: Optional[ConnectionCategory] = None
+    custom: bool

fides/api/service/async_dsr/strategies/async_dsr_strategy_polling.py

@@ -310,7 +310,7 @@ class AsyncPollingStrategy(AsyncDSRStrategy):
         logger.info(f"Prepared requests: {len(prepared_requests)}")
 
         for next_request, param_value_map in prepared_requests:
-            response = client.send(next_request)
+            response = client.send(next_request, read_request.ignore_errors)
 
             if not response.ok:
                 raise FidesopsException(
@@ -365,6 +365,11 @@ class AsyncPollingStrategy(AsyncDSRStrategy):
                 )
                 response = client.send(prepared_request, request.ignore_errors)
 
+                if not response.ok:
+                    raise FidesopsException(
+                        f"Initial erasure request failed with status code {response.status_code}: {response.text}"
+                    )
+
                 # Extract correlation ID from response (required, like access requests)
                 try:
                     response_data = response.json()
@@ -551,13 +556,20 @@ class AsyncPollingStrategy(AsyncDSRStrategy):
                 self.result_request.result_path,
             )
 
-        # Ensure we have the expected polling result type
-        if not isinstance(polling_result, PollingResult):
-            raise PrivacyRequestError("Polling result must be PollingResult instance")
-
-        # Store results on the sub-request
-        self._store_sub_request_result(polling_result, sub_request, polling_task)
+        # Checks if we have a polling result, response could be empty in case there was no data to access
+        if polling_result:
+            # Ensure we have the expected polling result type
+            if not isinstance(polling_result, PollingResult):
+                raise PrivacyRequestError(
+                    "Polling result must be PollingResult instance"
+                )
 
+            # Store results on the sub-request
+            self._store_sub_request_result(polling_result, sub_request, polling_task)
+        else:
+            logger.info(
+                f"No result response for sub-request {sub_request.id} for task {polling_task.id}"
+            )
         # Mark as complete using existing method
         sub_request.update_status(self.session, ExecutionLogStatus.complete.value)
 

fides/api/service/connectors/base_erasure_email_connector.py

@@ -59,11 +59,18 @@ class BaseErasureEmailConnector(BaseEmailConnector):
         self, user_identities: Dict[str, Any], privacy_request: PrivacyRequest
     ) -> bool:
         """Schedules an erasure email for erasure privacy requests containing the required identities"""
+
+        # do not send erasure emails if there is more than 1 action type for the request.
+        # we use consent + erasure types to facilitate Do Not Sell features.
+        multiple_action_types = len(privacy_request.policy.get_all_action_types()) > 1
+
         erasure_rules: List[Rule] = privacy_request.policy.get_rules_for_action(
             action_type=ActionType.erasure
         )
+
         return bool(
             erasure_rules
+            and not multiple_action_types
             and filter_user_identities_for_connector(self.config, user_identities)
         )
 

fides/api/service/connectors/microsoft_sql_server_connector.py

@@ -25,7 +25,7 @@ class MicrosoftSQLServerConnector(SQLConnector):
     def build_uri(self) -> URL:
         """
         Build URI of format
-        mssql+pymssql://[username]:[password]@[host]:[port]/[dbname]
+        mssql+pymssql://[username]:[password]@[host]:[port]/[dbname]?read_only=[read_only_connection]
         Returns URL obj, since SQLAlchemy's create_engine method accepts either a URL obj or a string
         """
 
@@ -38,6 +38,11 @@ class MicrosoftSQLServerConnector(SQLConnector):
             host=config.host,
             port=config.port,
             database=config.dbname,
+            query=(
+                {"read_only": str(config.read_only_connection)}
+                if config.read_only_connection
+                else None
+            ),
         )
 
         return url

fides/api/service/connectors/saas/connector_registry_service.py

@@ -13,7 +13,11 @@ from fides.api.api.deps import get_api_session
 from fides.api.common_exceptions import ValidationError
 from fides.api.cryptography.cryptographic_util import str_to_b64_str
 from fides.api.models.custom_connector_template import CustomConnectorTemplate
-from fides.api.schemas.saas.connector_template import ConnectorTemplate
+from fides.api.models.saas_template_dataset import SaasTemplateDataset
+from fides.api.schemas.saas.connector_template import (
+    ConnectorTemplate,
+    ConnectorTemplateListResponse,
+)
 from fides.api.schemas.saas.saas_config import SaaSConfig
 from fides.api.service.authentication.authentication_strategy_oauth2_authorization_code import (
     OAuth2AuthorizationCodeAuthenticationStrategy,
@@ -118,6 +122,11 @@ class CustomConnectorTemplateLoader(ConnectorTemplateLoader):
                     f"Replacing {template.key} connector template with newer version."
                 )
                 template.delete(db=db)
+                template_dataset = SaasTemplateDataset.get_by(
+                    db=db, field="connection_type", value=template.key
+                )
+                if template_dataset:
+                    template_dataset.delete(db=db)
                 continue
             try:
                 CustomConnectorTemplateLoader._register_template(template)
@@ -284,6 +293,15 @@ class CustomConnectorTemplateLoader(ConnectorTemplateLoader):
             },
         )
 
+        # Store the original template dataset (with placeholders) instead of the modified version
+        template_dataset_json = load_dataset_from_string(template.dataset)
+
+        SaasTemplateDataset.get_or_create(
+            db=db,
+            connector_type=connector_type,
+            dataset_json=template_dataset_json,
+        )
+
 
 class ConnectorRegistry:
     @classmethod
@@ -309,3 +327,29 @@ class ConnectorRegistry:
         Returns an object containing the various SaaS connector artifacts
         """
         return cls._get_combined_templates().get(connector_type)
+
+    @classmethod
+    def get_all_connector_templates_summary(cls) -> List[ConnectorTemplateListResponse]:
+        """
+        Returns summary information for all connector templates.
+        Includes connector_type, name, supported_actions, category, and whether it's custom.
+        """
+        custom_templates = CustomConnectorTemplateLoader.get_connector_templates()  # type: ignore
+        combined_templates = cls._get_combined_templates()
+
+        summaries: List[ConnectorTemplateListResponse] = []
+        for connector_type, template in combined_templates.items():
+            # Determine if the template is custom by checking if it exists in CustomConnectorTemplateLoader
+            is_custom = connector_type in custom_templates
+
+            summaries.append(
+                ConnectorTemplateListResponse(
+                    type=connector_type,
+                    name=template.human_readable,
+                    supported_actions=template.supported_actions,
+                    category=template.category,
+                    custom=is_custom,
+                )
+            )
+
+        return summaries

fides/api/service/messaging/message_dispatch_service.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, Dict, List, Optional, Union
 import requests
 import sendgrid
 from loguru import logger
+from requests.exceptions import RequestException, Timeout
 from sendgrid.helpers.mail import Content, Email, Mail, Personalization, TemplateId, To
 from sqlalchemy.orm import Session
 from twilio.base.exceptions import TwilioRestException
@@ -53,7 +54,18 @@ EMAIL_JOIN_STRING = ", "
 EMAIL_TEMPLATE_NAME = "fides"
 
 
-@celery_app.task(base=DatabaseTask, bind=True)
+@celery_app.task(
+    base=DatabaseTask,
+    bind=True,
+    autoretry_for=(
+        Timeout,
+        RequestException,
+        TwilioRestException,
+    ),
+    retry_kwargs={"max_retries": 3},
+    retry_backoff=2,
+    retry_jitter=True,
+)
 def dispatch_message_task(
     self: DatabaseTask,
     message_meta: Dict[str, Any],
@@ -62,7 +74,14 @@ def dispatch_message_task(
     property_id: Optional[str],
 ) -> None:
     """
-    A wrapper function to dispatch a message task into the Celery queues
+    A wrapper function to dispatch a message task into the Celery queues.
+
+    This task will automatically retry up to 3 times on transient network failures
+    (timeouts, connection errors, temporary service unavailability) with exponential
+    backoff (2s, 4s, 8s) and jitter to prevent thundering herd issues.
+
+    Permanent errors (missing config, invalid identities, etc.) will fail immediately
+    without retry to provide fast feedback and avoid wasting worker resources.
     """
     schema = FidesopsMessage.model_validate(message_meta)
     with self.get_new_session() as db:
@@ -467,7 +486,6 @@ def _build_email(  # pylint: disable=too-many-return-statements, too-many-branch
             ),
         )
     if action_type == MessagingActionType.EXTERNAL_USER_WELCOME:
-        base_template = get_email_template(action_type)
         # Generate display name for personalization
         display_name = body_params.username
         if body_params.first_name:
@@ -490,8 +508,26 @@ def _build_email(  # pylint: disable=too-many-return-statements, too-many-branch
             "access_token": body_params.access_token,
         }
 
+        # Start with default subject
+        subject = "Welcome to our Privacy Center"
+
+        # If messaging template exists, extract customizable content
+        if messaging_template:
+            # Use custom subject if provided
+            if "subject" in messaging_template.content:
+                subject = _render(messaging_template.content["subject"], variables)
+
+            # Use custom body content to replace the intro text in HTML template
+            custom_body = messaging_template.content.get("body", "")
+            if custom_body.strip():
+                # Replace the default intro text with the custom body content
+                rendered_custom_body = _render(custom_body, variables)
+                variables["custom_intro"] = rendered_custom_body
+
+        # Always use the HTML template
+        base_template = get_email_template(action_type)
         return EmailForActionType(
-            subject="Welcome to our Privacy Center",
+            subject=subject,
             body=base_template.render(variables),
             template_variables=variables,
         )
@@ -600,6 +636,7 @@ def _mailchimp_transactional_dispatcher(
         "https://mandrillapp.com/api/1.0/messages/send",
         headers={"Content-Type": "application/json"},
         data=data,
+        timeout=10,
     )
     if not response.ok:
         logger.error("Email failed to send with status code: %s", response.status_code)
@@ -647,6 +684,7 @@ def _mailgun_dispatcher(
                 "api",
                 messaging_config.secrets[MessagingServiceSecrets.MAILGUN_API_KEY.value],
             ),
+            timeout=10,
         )
 
         data = {
@@ -671,6 +709,7 @@ def _mailgun_dispatcher(
                     ],
                 ),
                 data=data,
+                timeout=10,
             )
 
             if not response.ok:
@@ -691,6 +730,7 @@ def _mailgun_dispatcher(
                     ],
                 ),
                 data=data,
+                timeout=10,
             )
             if not response.ok:
                 logger.error(

fides/api/service/privacy_request/dsr_package/dsr_report_builder.py

@@ -45,7 +45,7 @@ class DSRReportBuilder:
     pages to a zip file in a way that the pages can be navigated between.
 
     The zip file is structured as follows:
-    - welcome.html: the main index page
+    - clickme.html: the main index page
     - data/dataset_name/index.html: the index page for the dataset
     - data/dataset_name/collection_name/index.html: the index page for the collection
     - data/dataset_name/collection_name/item_index.html: the detail page for the item
@@ -565,9 +565,9 @@ class DSRReportBuilder:
 
             # create the main index once all the datasets have been added
             self._add_file(
-                "welcome.html",
+                "clickme.html",
                 self._populate_template(
-                    "templates/welcome.html", "DSR Report", None, self.main_links
+                    "templates/clickme.html", "DSR Report", None, self.main_links
                 ),
             )
         finally:

fides/api/service/privacy_request/dsr_package/templates/attachments_index.html

@@ -1,35 +1,46 @@
 <html>
-   <head>
-      <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600">
-      <link rel="stylesheet" href="../data/main.css">
-   </head>
-   <body>
-      <div class="container">
-         <div class="header"></div>
-         <div class="content">
-            <div class="button-container">
-               <a href="../welcome.html">
-                  <div class="button"><img src="../data/back.svg"></div>
-                  <span>Back to main page</span>
-               </a>
+  <head>
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600"
+    />
+    <link rel="stylesheet" href="../data/main.css" />
+  </head>
+  <body>
+    <div class="container">
+      <div class="header"></div>
+      <div class="content">
+        <div class="button-container">
+          <a href="../clickme.html">
+            <div class="button"><img src="../data/back.svg" /></div>
+            <span>Back to main page</span>
+          </a>
+        </div>
+        <h1>Attachments</h1>
+        {% if not enable_streaming %}
+        <p class="expiration-notice">
+          Note: All download links will expire in {{ download_link_ttl_days }}
+          days.
+        </p>
+        {% endif %}
+        <div class="table table-hover">
+          <div class="table-row">
+            <div class="table-cell" style="text-align: left">File Name</div>
+            <div class="table-cell" style="text-align: left">Size</div>
+          </div>
+          {% for name, info in data.items() %}
+          <a href="{{ info.url }}" class="table-row" target="_blank">
+            <div class="table-cell" style="text-align: left">
+              {% if enable_streaming %}{{ name }}{% else %}{{ info.original_name
+              }}{% endif %}
             </div>
-            <h1>Attachments</h1>
-            {% if not enable_streaming %}
-            <p class="expiration-notice">Note: All download links will expire in {{ download_link_ttl_days }} days.</p>
-            {% endif %}
-            <div class="table table-hover">
-               <div class="table-row">
-                  <div class="table-cell" style="text-align: left;">File Name</div>
-                  <div class="table-cell" style="text-align: left;">Size</div>
-               </div>
-               {% for name, info in data.items() %}
-               <a href="{{ info.url }}" class="table-row" target="_blank">
-                  <div class="table-cell" style="text-align: left;">{% if enable_streaming %}{{ name }}{% else %}{{ info.original_name }}{% endif %}</div>
-                  <div class="table-cell" style="text-align: left;">{{ info.size }}</div>
-               </a>
-               {% endfor %}
+            <div class="table-cell" style="text-align: left">
+              {{ info.size }}
             </div>
-         </div>
+          </a>
+          {% endfor %}
+        </div>
       </div>
-   </body>
+    </div>
+  </body>
 </html>