Merge branch 'main' into 42-badges-fixes

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 <!-- version list -->
 
+## v1.1.1 (2025-10-05)
+
+### Bug Fixes
+
+- Add content_type to attestation table
+  ([`2fd68a5`](https://github.com/scribe-security/attstore/commit/2fd68a52b8284049026d4a64545675343a3b8116))
+
+- Lock colors
+  ([`ee842bb`](https://github.com/scribe-security/attstore/commit/ee842bbb817fba4747d18fa334f5947e6097dc30))
+
+
+## v1.1.0 (2025-10-05)
+
+### Features
+
+- Filter products by version substrings
+  ([`aa9e4d9`](https://github.com/scribe-security/attstore/commit/aa9e4d95741fc70f1801d517af9e8a72637a6538))
+
+- Support filtering attestations and policy results by version.
+  ([`735e852`](https://github.com/scribe-security/attstore/commit/735e85285c74372db35d6e0237b15ae3e0b83ede))
+
+
 ## v1.0.5 (2025-09-29)
 
 ### Bug Fixes

static/css/custom.css

@@ -1,3 +1,10 @@
+/* Custom lock icon colors for attestation page */
+.icon-lock-locked {
+    color: #4fc3f7 !important; /* Light blue */
+}
+.icon-lock-unlocked {
+    color: #ba68c8 !important; /* Purple */
+}
 /* Custom CSS for Attestation Store */
 
 /* Root variables for consistency */

templates/attestations.html

@@ -32,6 +32,9 @@
                         {% endfor %}
                     </select>
                 </div>
+                <div class="col-md-2">
+                    <input type="text" class="form-control" name="version" placeholder="Version (substring)" value="{{ version_filter }}">
+                </div>
                 <div class="col-md-3">
                     <select class="form-select" name="target_type" aria-label="Filter by target type">
                         <option value="">Target Type (all)</option>
@@ -123,11 +126,14 @@
                             <td>
                                 <div class="d-inline-flex align-items-center">
                                     {% if attestation.sig_status == 'signed' %}
-                                    <i data-feather="lock" class="{% if attestation.deleted %}text-secondary{% else %}text-success{% endif %} me-2" style="width: 16px; height: 16px;" title="Signed attestation"></i>
+                                    <i data-feather="lock" class="{% if attestation.deleted %}text-secondary{% else %}icon-lock-locked{% endif %} me-2" style="width: 16px; height: 16px;" title="Signed attestation"></i>
                                     {% else %}
-                                    <i data-feather="unlock" class="{% if attestation.deleted %}text-secondary{% else %}text-warning{% endif %} me-2" style="width: 16px; height: 16px;" title="Unsigned attestation"></i>
+                                    <i data-feather="unlock" class="{% if attestation.deleted %}text-secondary{% else %}icon-lock-unlocked{% endif %} me-2" style="width: 16px; height: 16px;" title="Unsigned attestation"></i>
                                     {% endif %}
                                     {{ attestation.target_type }}
+                                    {% if attestation.content_type %}
+                                    <span class="badge bg-secondary ms-2">{{ attestation.content_type }}</span>
+                                    {% endif %}
                                 </div>
                             </td>
                             <td>{{ attestation.tool or 'Unknown' }}</td>

templates/policy_results.html

@@ -70,6 +70,9 @@
                 {% endfor %}
             </select>
         </div>
+        <div class="col-md-2">
+            <input type="text" class="form-control" name="version" placeholder="Version (substring)" value="{{ version_filter }}">
+        </div>
         <div class="col-md-3">
             <input type="text" class="form-control" name="rule_id" placeholder="Rule ID (substring)" value="{{ rule_id_filter }}">
         </div>
@@ -194,14 +197,15 @@
     <!-- Pagination -->
     {% if pagination.pages > 1 %}
     {% macro page_url(page_num) -%}
-        {{ url_for('web.policy_results') }}?
-        {%- if product_filter %}product={{ product_filter|urlencode }}&{% endif -%}
-        {%- if rule_id_filter %}rule_id={{ rule_id_filter|urlencode }}&{% endif -%}
-        {%- if result_kind_filter %}result_kind={{ result_kind_filter|urlencode }}&{% endif -%}
-        {%- if result_level_filter %}result_level={{ result_level_filter|urlencode }}&{% endif -%}
-        {%- if show_all_users and is_admin %}show_all_users=on&{% endif -%}
-        {%- if user_filter and show_all_users and is_admin %}user_filter={{ user_filter }}&{% endif -%}
-        page={{ page_num }}
+    {{ url_for('web.policy_results') }}?
+    {%- if product_filter %}product={{ product_filter|urlencode }}&{% endif -%}
+    {%- if version_filter %}version={{ version_filter|urlencode }}&{% endif -%}
+    {%- if rule_id_filter %}rule_id={{ rule_id_filter|urlencode }}&{% endif -%}
+    {%- if result_kind_filter %}result_kind={{ result_kind_filter|urlencode }}&{% endif -%}
+    {%- if result_level_filter %}result_level={{ result_level_filter|urlencode }}&{% endif -%}
+    {%- if show_all_users and is_admin %}show_all_users=on&{% endif -%}
+    {%- if user_filter and show_all_users and is_admin %}user_filter={{ user_filter }}&{% endif -%}
+    page={{ page_num }}
     {%- endmacro %}
     <nav class="mt-4">
         <ul class="pagination justify-content-center">

templates/products.html

@@ -19,9 +19,12 @@
     <div class="card mb-4">
         <div class="card-body">
             <form method="GET" class="row g-3 align-items-center">
-                <div class="col-md-4">
+                <div class="col-md-3">
                     <input type="text" class="form-control" name="filter" placeholder="Products substring" value="{{ filter_query }}">
                 </div>
+                <div class="col-md-3">
+                    <input type="text" class="form-control" name="version" placeholder="Version substring" value="{{ version_filter }}">
+                </div>
                 {% if is_admin %}
                 <div class="col-md-3 form-check align-items-center d-flex">
                     <input class="form-check-input me-2" type="checkbox" id="showAllCheckbox" name="show_all" value="1" {% if show_all %}checked{% endif %} onchange="this.form.submit()">
@@ -85,10 +88,10 @@
                                 {% endfor %}
                             </td>
                             <td class="text-center">
-                                <a href="/products/{{ p.product }}/attestations" class="btn btn-sm btn-outline-primary me-1">
+                                <a href="/products/{{ p.product }}/{{ p.version }}/attestations" class="btn btn-sm btn-outline-primary me-1">
                                     <i data-feather="file-text" class="me-1"></i> Attestations
                                 </a>
-                                <a href="/products/{{ p.product }}/policy_results" class="btn btn-sm btn-outline-info">
+                                <a href="/products/{{ p.product }}/{{ p.version }}/policy_results" class="btn btn-sm btn-outline-info">
                                     <i data-feather="shield" class="me-1"></i> Policy Results
                                 </a>
                             </td>

version.py

@@ -1 +1 @@
-__version__ = "1.0.5"
+__version__ = "1.1.1"

web/products.py

@@ -2,7 +2,7 @@ from flask import Blueprint, render_template, request, redirect, url_for, sessio
 from models import db, Attestation, PolicyResult, Product
 from sqlalchemy import func, text
 
-def get_products_with_stats(filter_query=None, user_id=None, show_all=False):
+def get_products_with_stats(filter_query=None, version_filter=None, user_id=None, show_all=False):
     # Only consume data from products table
     query = Product.query.filter(Product.deleted == False)
     if not show_all and user_id is not None:
@@ -12,6 +12,9 @@ def get_products_with_stats(filter_query=None, user_id=None, show_all=False):
         query = query.filter(
             Product.product_key.ilike(like_pattern)
         )
+    if version_filter:
+        version_like = f'%{version_filter}%'
+        query = query.filter(Product.product_version.ilike(version_like))
     # Paging support
     page = request.args.get('page', 1, type=int)
     per_page = request.args.get('per_page', 20, type=int)
@@ -48,7 +51,6 @@ def get_products_with_stats(filter_query=None, user_id=None, show_all=False):
             'user_id': product.user_id
         })
     return products, pagination
-    return products
 
 # Function to update product data
 def update_product_data(product_key, product_version, name=None, description=None, metadata=None, badges=None, user_id=None):

web/routes.py

@@ -224,6 +224,7 @@ def login_required(f):
 @login_required
 def products_page():
     filter_query = request.args.get('filter', '')
+    version_filter = request.args.get('version', '')
     page = request.args.get('page', 1, type=int)
     per_page = request.args.get('per_page', 20, type=int)
     user_id = session.get('user_id')
@@ -234,8 +235,8 @@ def products_page():
         is_admin = _is_admin_user_web(user_id)
         if is_admin:
             show_all = request.args.get('show_all', '0') == '1'
-    products, pagination = get_products_with_stats(filter_query, user_id=user_id, show_all=show_all)
-    return render_template('products.html', products=products, pagination=pagination, filter_query=filter_query, show_all=show_all, is_admin=is_admin)
+    products, pagination = get_products_with_stats(filter_query, version_filter=version_filter, user_id=user_id, show_all=show_all)
+    return render_template('products.html', products=products, pagination=pagination, filter_query=filter_query, version_filter=version_filter, show_all=show_all, is_admin=is_admin)
 
 # --- Products CSV Download ---
 @web_bp.route('/products/download-csv')
@@ -243,10 +244,11 @@ def products_page():
 def download_products_csv():
     """Download products table as CSV, one line per product version and badge."""
     filter_query = request.args.get('filter', '')
+    version_filter = request.args.get('version', '')
     page = request.args.get('page', 1, type=int)
     per_page = request.args.get('per_page', 20, type=int)
     custom_filename = request.args.get('filename', '')
-    products, pagination = get_products_with_stats(filter_query)
+    products, pagination = get_products_with_stats(filter_query, version_filter=version_filter)
     from models import Badge
     all_badges = Badge.query.order_by(Badge.name).all()
     output = io.StringIO()
@@ -677,6 +679,7 @@ def attestations():
     
     # Get filter parameters
     product_filter = request.args.get('product', '')
+    version_filter = request.args.get('version', '')
     target_type_filter = request.args.get('target_type', '')
     tool_filter = request.args.get('tool', '')
     search_filter = request.args.get('search', '')
@@ -693,13 +696,12 @@ def attestations():
     # Apply filters
     if product_filter and product_filter.strip():
         query = query.filter(Attestation.product_key == product_filter.strip())
-        
+    if version_filter and version_filter.strip():
+        query = query.filter(Attestation.product_version.ilike(f"%{version_filter.strip()}%"))
     if target_type_filter:
         query = query.filter(Attestation.target_type == target_type_filter)
-        
     if tool_filter:
         query = query.filter(Attestation.tool.ilike(f"%{tool_filter}%"))
-        
     if id_filter and id_filter.strip():
         try:
             attestation_id = int(id_filter.strip())
@@ -707,7 +709,6 @@ def attestations():
         except ValueError:
             # If not a valid integer, ignore the filter
             pass
-        
     if search_filter:
         query = query.filter(
             db.or_(
@@ -774,6 +775,7 @@ def attestations():
                          target_types=target_types,
                          tools=tools,
                          product_filter=product_filter,
+                         version_filter=version_filter,
                          target_type_filter=target_type_filter,
                          tool_filter=tool_filter,
                          search_filter=search_filter,
@@ -1823,6 +1825,7 @@ def policy_results():
     # Filtering
     rule_id_filter = request.args.get('rule_id', '')
     product_filter = request.args.get('product', '')
+    version_filter = request.args.get('version', '')
     result_kind_filter = request.args.get('result_kind', '')
     result_level_filter = request.args.get('result_level', '')
     # Explicitly default show_all_users to False when not provided
@@ -1855,6 +1858,8 @@ def policy_results():
 
     if product_filter and product_filter.strip():
         query = query.filter(PolicyResult.product_key == product_filter.strip())
+    if version_filter and version_filter.strip():
+        query = query.filter(PolicyResult.product_version.ilike(f"%{version_filter.strip()}%"))
 
     if result_kind_filter:
         query = query.filter(PolicyResult.result_kind == result_kind_filter)
@@ -1919,6 +1924,7 @@ def policy_results():
         distinct_rule_count=distinct_rule_count,
         rule_id_filter=rule_id_filter,
         product_filter=product_filter,
+        version_filter=version_filter,
         result_kind_filter=result_kind_filter,
         result_level_filter=result_level_filter,
         product_keys=product_keys,
@@ -2430,11 +2436,13 @@ def update_product():
     return jsonify({'success': True, 'product': product.to_dict()})
 
 # Product attestations redirect
-@web_bp.route('/products/<product>/attestations')
-def product_attestations(product):
-    return redirect(url_for('web.attestations', product=product))
-
-# Product policy results redirect
-@web_bp.route('/products/<product>/policy_results')
-def product_policy_results(product):
-    return redirect(url_for('web.policy_results', product=product))
+
+# Product attestations redirect (with version)
+@web_bp.route('/products/<product>/<version>/attestations')
+def product_attestations(product, version):
+    return redirect(url_for('web.attestations', product=product, version=version))
+
+# Product policy results redirect (with version)
+@web_bp.route('/products/<product>/<version>/policy_results')
+def product_policy_results(product, version):
+    return redirect(url_for('web.policy_results', product=product, version=version))