Almirah 0.4.0 → 0.4.2

data/lib/almirah/doc_types/source_file.rb

@@ -25,7 +25,6 @@ class SourceFile < PersistentDocument
     depth = relative_path.count('/') + 1 # +1 for the repository folder
     depth += 1 # for the source_files folder
     @specifications_path = "./#{'../' * depth}specifications/"
-    puts @specifications_path
   end
 
   def to_console
@@ -78,13 +77,10 @@ class SourceFile < PersistentDocument
     @html_file_path = output_file_path
     FileUtils.mkdir_p(File.dirname(output_file_path))
 
-    # Calculate the relative path depth to determine correct number of parent directory symbols
-    relative_path = @path.sub("#{@root_path}/", '')
-    depth = relative_path.count('/') + 1 # +1 for the repository folder
-    depth += 1 # for the source_files folder
-    css_path = "#{'../' * depth}css/main.css"
-    js_path = "#{'../' * depth}scripts/main.js"
-    index_path = "#{'../' * depth}index.html"
+    @output_rel_path = output_file_path.split('/build/', 2).last
+    css_path = rel_to('css/main.css')
+    js_path = rel_to('scripts/main.js')
+    index_path = rel_to('index.html')
 
     file = File.open(output_file_path, 'w')
     file_data.each do |s|

data/lib/almirah/doc_types/traceability.rb

@@ -75,7 +75,7 @@ class Traceability < BaseDocument
                 top_item.down_links.each do |bottom_item|
                     id_color = "style='background-color: ##{bottom_item.parent_doc.color};'"
                     bottom_f_text = bottom_item.format_string( bottom_item.text )
-                    document_section = bottom_item.parent_heading.get_section_info
+                    document_section = bottom_item.parent_heading.get_section_info_html
                     s += "\t<tr>\n"
                     s += "\t\t<td class=\"item_id\"><a href=\"./../#{top_item.parent_doc.id}/#{top_item.parent_doc.id}.html##{top_item.id}\" class=\"external\">#{top_item.id}</a></td>\n"
                     s += "\t\t<td class=\"item_text\" style='width: 34%;'>#{top_f_text}</td>\n"
@@ -105,7 +105,7 @@ class Traceability < BaseDocument
                     if bottom_item.parent_doc.id == @bottom_doc.id
 
                         bottom_f_text = bottom_item.format_string( bottom_item.text )
-                        document_section = bottom_item.parent_heading.get_section_info
+                        document_section = bottom_item.parent_heading.get_section_info_html
 
                         s += "\t<tr>\n"
                         s += "\t\t<td class=\"item_id\" #{id_color}><a href=\"./../#{top_item.parent_doc.id}/#{top_item.parent_doc.id}.html##{top_item.id}\" class=\"external\">#{top_item.id}</a></td>\n"

data/lib/almirah/dom/doc_section.rb

@@ -11,7 +11,7 @@ class DocSection
     s = ''
     s += "\t<li onclick=\"nav_toggle_expand_list(this, event)\">" \
       '<span class="fa-li"><i class="fa fa-minus-square-o"> </i></span>'
-    s += "<a href=\"##{@heading.anchor_id}\">#{@heading.get_section_info}</a>\n"
+    s += "<a href=\"##{@heading.anchor_id}\">#{@heading.get_section_info_html}</a>\n"
     unless @sections.empty?
       s += "\t\t<ul class=\"fa-ul\">\n"
       @sections.each do |sub_section|

data/lib/almirah/dom/document.rb

@@ -64,7 +64,7 @@ class Document
 
   def section_tree_to_html
     s = ''
-    s += "<a href=\"##{@root_section.heading.anchor_id}\">#{@root_section.heading.get_section_info}</a>\n"
+    s += "<a href=\"##{@root_section.heading.anchor_id}\">#{@root_section.heading.get_section_info_html}</a>\n"
     unless @root_section.sections.empty?
       s += "\t<ul class=\"fa-ul\" style=\"margin-top: 2px;\">\n"
       @root_section.sections.each do |sub_section|

data/lib/almirah/html_safe.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'cgi'
+
+# Shared HTML output-encoding helpers (ADR-188, SRS-096/097/098).
+#
+# Author-written Markdown is untrusted text and must be encoded for its HTML
+# context at the point of output. These helpers are the single mechanism every
+# renderer routes through, so coverage cannot drift item-by-item the way it did
+# when only inline code and wiki-link text were escaped.
+module HtmlSafe
+  # URL schemes permitted in link/image targets. Anything else (notably
+  # javascript:, data:, vbscript:) is treated as unsafe and rendered inert.
+  ALLOWED_URL_SCHEMES = %w[http https mailto].freeze
+
+  # Escapes literal text rendered into element content (the five characters:
+  # & < > " '). Used for paragraph, heading, blockquote, table-cell and fenced
+  # code block text. SRS-096.
+  def escape_text(str)
+    CGI.escapeHTML(str.to_s)
+  end
+
+  # Escapes a value interpolated into a quoted HTML attribute so it cannot
+  # terminate the attribute or introduce new attributes/elements. SRS-097.
+  def escape_attr(str)
+    CGI.escapeHTML(str.to_s)
+  end
+
+  # Returns the URL when it is a relative/anchor reference or carries an allowed
+  # scheme; returns nil for any other scheme so the caller can render the
+  # link/image inert. SRS-098.
+  def safe_url(raw)
+    url = raw.to_s.strip
+    scheme = url[/\A([a-z][a-z0-9+.-]*):/i, 1]
+    return url if scheme.nil? # relative path or anchor reference
+
+    ALLOWED_URL_SCHEMES.include?(scheme.downcase) ? url : nil
+  end
+end

data/lib/almirah/link_registry.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Project-wide registry of managed documents, used to resolve cross-document
+# links (ADR-186) to their generated output pages. Documents are indexed by
+# their id / filename stem (case-insensitive, folder-independent) and, when they
+# originate from a source file, by their absolute source path (for native
+# Markdown relative links).
+class LinkRegistry
+  attr_reader :collisions
+
+  def initialize
+    @by_id = {}
+    @by_source = {}
+    @collisions = []
+  end
+
+  # Each registered document is expected to already carry an output_rel_path
+  # (its generated page, relative to the build root).
+  def register(doc)
+    register_id(doc.id.to_s.downcase, doc)
+    return unless doc.respond_to?(:path) && doc.path
+
+    # Also index by the filename stem so a document resolves by filename, not
+    # only by id (SRS-090). For specs/protocols the stem equals the id; for
+    # decision records the id is the truncated <letters>-<digits> prefix, so the
+    # full stem (e.g. "adr-170-introduce-decision-records") is a distinct alias.
+    register_id(File.basename(doc.path, '.*').downcase, doc)
+    @by_source[File.expand_path(doc.path)] = doc
+  end
+
+  def find_by_id(id)
+    @by_id[id.to_s.downcase]
+  end
+
+  def find_by_source(source_path)
+    @by_source[File.expand_path(source_path)]
+  end
+
+  private
+
+  # Adds an id/stem key for a document, recording a collision only when the key
+  # already maps to a different document. Registering the same document under
+  # both its id and its filename stem is expected and not a collision.
+  def register_id(key, doc)
+    return if key.empty?
+
+    if @by_id.key?(key) && !@by_id[key].equal?(doc)
+      @collisions << key
+    else
+      @by_id[key] = doc
+    end
+  end
+end

data/lib/almirah/project/project_data.rb

@@ -1,9 +1,11 @@
+require_relative '../link_registry'
+
 class ProjectData
   attr_reader :specifications, :protocols, :traceability_matrices, :coverage_matrices, :source_files,
               :specifications_dictionary, :covered_specifications_dictionary, :implemented_specifications_dictionary,
-              :implementation_matrices, :decisions
+              :implementation_matrices, :decisions, :link_registry
 
-  def initialize
+  def initialize # rubocop:disable Metrics/MethodLength
     @specifications = []
     @protocols = []
     @traceability_matrices = []
@@ -15,5 +17,7 @@ class ProjectData
     @specifications_dictionary = {}
     @covered_specifications_dictionary = {}
     @implemented_specifications_dictionary = {}
+
+    @link_registry = LinkRegistry.new
   end
 end

data/lib/almirah/project.rb

@@ -9,6 +9,8 @@ require_relative 'search/specifications_db'
 require_relative 'project/doc_linker'
 require_relative 'project_configuration'
 require_relative 'project/project_data'
+require_relative 'console_reporter'
+require_relative 'relative_url'
 
 class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
   attr_accessor :index, :project, :configuration, :project_data
@@ -47,6 +49,7 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     link_all_source_files
     link_all_decisions
     check_wrong_specification_referenced
+    build_link_registry
     create_index
     render_all_specifications(@project_data.specifications)
     render_all_specifications(@project_data.traceability_matrices)
@@ -58,6 +61,8 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     render_all_decisions
     render_index
     create_search_data
+    report_broken_links
+    report_rendered
   end
 
   def specifications_and_results(test_run) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
@@ -70,6 +75,7 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     link_all_source_files
     link_all_decisions
     check_wrong_specification_referenced
+    build_link_registry
     create_index
     render_all_specifications(@project_data.specifications)
     render_all_specifications(@project_data.traceability_matrices)
@@ -81,20 +87,60 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     render_all_decisions
     render_index
     create_search_data
+    report_broken_links
+    report_rendered
+  end
+
+  def report_rendered
+    root = @configuration.project_root_directory
+    base = root == Dir.pwd ? '.' : root
+    ConsoleReporter.result('rendering HTML', File.join(base, 'build', 'index.html'))
+  end
+
+  # Reports cross-document links that could not be resolved (ADR-186, SRS-094),
+  # naming the linking document. The build still completes.
+  def report_broken_links
+    broken = TextLine.broken_links
+    return if broken.empty?
+
+    ConsoleReporter.warn('broken links', broken.length)
+    broken.each { |b| puts ConsoleReporter.warn_detail("  #{b[:document] || '?'}: #{b[:target]}") }
+  end
+
+  # Assigns each document its generated output path (relative to the build root)
+  # and registers it for cross-document link resolution (ADR-186). Runs after all
+  # documents are parsed and before any rendering, so link targets are known.
+  def build_link_registry # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+    reg = @project_data.link_registry
+    TextLine.link_registry = reg
+    TextLine.reset_broken_links
+    @project_data.specifications.each do |d|
+      d.output_rel_path = "specifications/#{d.id}/#{d.id}.html"
+      reg.register(d)
+    end
+    @project_data.protocols.each do |d|
+      d.output_rel_path = "tests/protocols/#{d.id}/#{d.id}.html"
+      reg.register(d)
+    end
+    @project_data.decisions.each do |d|
+      d.output_rel_path = "decisions/#{d.html_rel_path}"
+      reg.register(d)
+    end
+    @project_data.source_files.each do |d|
+      rel = d.path.sub("#{d.root_path}/", '')
+      d.output_rel_path = "source_files/#{d.repository}/#{rel}.html"
+      reg.register(d)
+    end
   end
 
   def parse_all_specifications
     path = @configuration.project_root_directory
-    # do a lasy pass first to get the list of documents id
     Dir.glob("#{path}/specifications/**/*.md").each do |f|
-      DocFabric.add_lazy_doc_id(f)
-    end
-    # parse documents in the second pass
-    Dir.glob("#{path}/specifications/**/*.md").each do |f| # rubocop:disable Style/CombinableLoops
       doc = DocFabric.create_specification(f)
       @project_data.specifications.append(doc)
       @project_data.specifications_dictionary[doc.id.to_s.downcase] = doc
     end
+    ConsoleReporter.count('parsing specifications', @project_data.specifications.length)
   end
 
   def parse_all_protocols
@@ -103,6 +149,7 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
       doc = DocFabric.create_protocol(f)
       @project_data.protocols.append(doc)
     end
+    ConsoleReporter.count('parsing test protocols', @project_data.protocols.length)
   end
 
   def parse_all_source_files
@@ -132,6 +179,7 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
       @project_data.decisions.append(doc)
     end
     BaseDocument.show_decisions_link = @project_data.decisions.any?
+    ConsoleReporter.count('parsing decisions', @project_data.decisions.length)
   end
 
   def parse_test_run(test_run)
@@ -158,6 +206,7 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
         @project_data.traceability_matrices.append doc
       end
     end
+    ConsoleReporter.count('traceability matrices', @project_data.traceability_matrices.length)
   end
 
   def link_all_protocols # rubocop:disable Metrics/MethodLength
@@ -174,16 +223,20 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
       doc = DocFabric.create_coverage_matrix(value)
       @project_data.coverage_matrices.append doc
     end
+    ConsoleReporter.count('coverage matrices', @project_data.coverage_matrices.length)
   end
 
   def link_all_decisions
+    number_of_links = 0
     @project_data.decisions.each do |d|
       @project_data.specifications.each do |s|
         next unless d.up_link_docs.key?(s.id.to_s)
 
         DocLinker.link_decision_to_spec(d, s)
+        number_of_links += 1
       end
     end
+    ConsoleReporter.count('decision links', number_of_links)
   end
 
   def link_all_source_files
@@ -194,6 +247,7 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
       doc = DocFabric.create_implementation_document(value)
       @project_data.implementation_matrices.append doc
     end
+    ConsoleReporter.count('implementation matrices', @project_data.implementation_matrices.length)
   end
 
   def check_wrong_specification_referenced # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
@@ -267,14 +321,12 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     @index = Index.new(@project)
   end
 
-  def render_all_specifications(spec_list) # rubocop:disable Metrics/MethodLength
+  def render_all_specifications(spec_list)
     path = @configuration.project_root_directory
 
     FileUtils.mkdir_p("#{path}/build/specifications")
 
     spec_list.each do |doc|
-      doc.to_console
-
       img_src_dir = "#{path}/specifications/#{doc.id}/img"
       img_dst_dir = "#{path}/build/specifications/#{doc.id}/img"
 
@@ -310,8 +362,6 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     FileUtils.mkdir_p("#{path}/build/source_files")
 
     @project_data.source_files.each do |doc|
-      doc.to_console
-
       doc.to_html("#{path}/build/source_files/")
     end
   end
@@ -320,8 +370,6 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     path = @configuration.project_root_directory
 
     doc = @index
-    doc.to_console
-
     doc.to_html("#{path}/build/")
   end
 
@@ -332,7 +380,6 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
     FileUtils.mkdir_p("#{path}/build/decisions")
 
     doc = DocFabric.create_decisions_overview(@project)
-    doc.to_console
     doc.to_html("#{path}/build/decisions/")
   end
 
@@ -347,7 +394,6 @@ class Project # rubocop:disable Metrics/ClassLength,Style/Documentation
       depth = 1 + (out_dir_rel == '.' ? 0 : out_dir_rel.split('/').size)
       doc.root_prefix = '../' * depth
       doc.specifications_path = "./#{doc.root_prefix}specifications/"
-      doc.to_console
       doc.to_html(NavigationPane.new(doc), "#{out_dir}/")
     end
   end

data/lib/almirah/project_configuration.rb

@@ -4,7 +4,7 @@ class ProjectConfiguration
     attr_accessor :project_root_directory, :parameters
 
     def initialize(path)
-        @project_root_directory = path
+        @project_root_directory = File.expand_path(path)
         @parameters = {}
         load_project_file
     end

data/lib/almirah/project_template.rb

@@ -14,6 +14,7 @@ class ProjectTemplate # rubocop:disable Style/Documentation
     create_architecture
     create_tests
     create_test_runs
+    create_decisions
   end
 
   def create_requirements
@@ -265,7 +266,7 @@ class ProjectTemplate # rubocop:disable Style/Documentation
   end
 
   def run_test_003
-    path = File.join(@project_root, 'tests/runs/010/tq-002')
+    path = File.join(@project_root, 'tests/runs/010/tq-001')
     FileUtils.mkdir_p path
 
     file_content = <<~EOS
@@ -295,4 +296,91 @@ class ProjectTemplate # rubocop:disable Style/Documentation
     file.puts file_content
     file.close
   end
+
+  def create_decisions
+    path = File.join(@project_root, 'decisions')
+    FileUtils.mkdir_p path
+
+    file_content = <<~EOS
+      ---
+      title: "ADR-001: Start Project Decision"
+      ---
+
+      # Status
+
+      |  | Date | Status |
+      |:---:|---|---|
+      | * | #{Time.now.strftime('%d-%m-%Y')} | Proposed |
+
+      # Context
+
+      This is an example decision record. It demonstrates how Almirah captures a
+      decision and links it to the requirements it affects.
+
+      # Decision
+
+      Describe the decision here. The leading "*" in the Status table marks the
+      current state of the record.
+
+      # Scope
+
+      | Item | Status | Start Date | Target Date | Description |
+      |---|---|---|---|---|
+      | Requirements | To Do | | | |
+      | Code | To Do | | | |
+      | Tests | To Do | | | |
+
+      # Out of Scope
+
+      The ADR contains the most important sections with no detailed content.
+
+      # Consequences
+
+      ## Positive
+
+      An ADR example will clearly show the approach Almirah framework use for any software changes.
+
+      ## Negative
+
+      The format of this ADR can be different that is required for the real project.
+
+      ## Neutral
+
+      TBD
+
+      # Alternatives Considered
+
+      - **Add an empty `decisions/` directory only.** Rejected: an empty folder neither teaches the format nor causes the overview page to render, so it would not exercise the feature.
+
+      # Affected Documents
+
+      Table below shows a requirement whose text this decision creates or updates.
+
+      | # | Proposed Text | Req-ID |
+      |---|---|---|
+      | 1 | This is a first requirement (controlled paragraph with ID equal to "REQ-001"). | >[REQ-001] |
+
+      # Software Versions
+
+      | Software Version Category | Software Version ID |
+      |---|---|
+      | Latest Released Version | n/a |
+      | Issue Found in Version | n/a |
+      | Target Release Version | 0.0.1 |
+
+      # References
+
+      TBD
+
+      # Review Evidences
+
+      TBD
+
+    EOS
+
+    path = File.join(path, 'adr-001-start-project-decision.md')
+    file = File.open(path, 'w')
+    file.puts file_content
+    file.close
+  end
 end

data/lib/almirah/relative_url.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+# Computes the relative URL between two generated pages, each given as a path
+# relative to the build root (e.g. "decisions/release 0.4.1/adr-185.html").
+# Produces forward-slash separators with spaces percent-encoded. Shared by all
+# internal cross-document links (ADR-186).
+module RelativeUrl
+  module_function
+
+  def between(from_output_rel, to_output_rel, fragment: nil)
+    from_dir = Pathname.new(from_output_rel).dirname
+    rel = Pathname.new(to_output_rel).relative_path_from(from_dir).to_s
+    url = rel.split('/').map { |segment| encode_segment(segment) }.join('/')
+    fragment && !fragment.empty? ? "#{url}##{fragment}" : url
+  end
+
+  def encode_segment(segment)
+    segment.gsub(' ', '%20')
+  end
+end

data/lib/almirah/search/specifications_db.rb

@@ -16,7 +16,7 @@ class SpecificationsDb
     @specifications.each do |sp|
       sp.items.each do |i|
         if (i.instance_of? Paragraph) or (i.instance_of? ControlledParagraph)
-          e = { 'document' => i.parent_doc.title, \
+          e = { 'doc_title' => i.parent_doc.title, \
                 'doc_color' => i.parent_doc.color, \
                 'text' => i.text, \
                 'heading_url' => i.parent_heading.get_url, \
@@ -36,7 +36,7 @@ class SpecificationsDb
     item_to_process.rows.each do |r|
       if r.is_a?(MarkdownList)
         f_text = r.text
-        e = {   'document' => item_for_reference.parent_doc.title, \
+        e = {   'doc_title' => item_for_reference.parent_doc.title, \
                 'doc_color' => item_for_reference.parent_doc.color, \
                 'text' => f_text, \
                 'heading_url' => item_for_reference.parent_heading.get_url, \
@@ -45,7 +45,7 @@ class SpecificationsDb
         add_markdown_list_item_to_db(data, item_for_reference, r)
       else
         f_text = r
-        e = {   'document' => item_for_reference.parent_doc.title, \
+        e = {   'doc_title' => item_for_reference.parent_doc.title, \
                 'doc_color' => item_for_reference.parent_doc.color, \
                 'text' => f_text, \
                 'heading_url' => item_for_reference.parent_heading.get_url, \
@@ -61,7 +61,7 @@ class SpecificationsDb
     item_to_process.rows.each do |row|
       table_text += "| #{row.join(' | ')} |"
     end
-    e = {   'document' => item_for_reference.parent_doc.title, \
+    e = {   'doc_title' => item_for_reference.parent_doc.title, \
             'doc_color' => item_for_reference.parent_doc.color, \
             'text' => table_text, \
             'heading_url' => item_for_reference.parent_heading.get_url, \

data/lib/almirah/templates/css/main.css

@@ -1,3 +1,8 @@
+html {
+    /* Leave room for the fixed #top_nav so in-page anchor links
+       are not hidden behind it when navigating to them. */
+    scroll-padding-top: 40px;
+}
 body {
     font-family: Verdana, sans-serif;
     font-size: 12px;
@@ -154,6 +159,11 @@ a:active {
     text-decoration: none;
     display: inline-block;
 }
+a.broken_link, a.broken_link:link, a.broken_link:visited, span.broken_link {
+    color: #c00;
+    text-decoration: underline wavy #c00;
+    cursor: help;
+}
 div.blockquote {
     display: block;
     background:#f9f9fb;
@@ -219,7 +229,9 @@ img{
     background: #EEEEEE;
     border: 1px solid #ddd;
     position: fixed;
-    height: 100%;       /* 100% Full-height */
+    top: 0;             /* Anchor top and bottom so the pane spans exactly the   */
+    bottom: 0;          /* viewport; padding/border stay inside the border box so */
+                        /* overflow-y scroll can reach the last items.            */
     visibility: hidden;
     z-index: 1;
     overflow-y: auto;

data/lib/almirah/templates/scripts/main.js

@@ -74,7 +74,10 @@ function openNav() {
   
       modal.style.display = "block";
       modalImg.src = clicked.src;
-      captionText.innerHTML = clicked.alt;
+      // Author-supplied alt text: insert as plain text, never as HTML (ADR-188).
+      // Reading clicked.alt yields the decoded value, so innerHTML here would
+      // re-parse author markup as live DOM (DOM-based XSS).
+      captionText.textContent = clicked.alt;
   }
   
   function modal_close_OnClick(clicked){

data/lib/almirah/templates/scripts/orama_search.js

@@ -1,5 +1,17 @@
 // Do search only on the Index Page
-import { create, search, insert } from 'https://unpkg.com/@orama/orama@latest/dist/index.js'
+import { create, search, insert } from 'https://unpkg.com/@orama/orama@3.1.18/dist/browser/index.js'
+
+// Author-derived values are treated as untrusted (ADR-188). Every result field
+// is inserted with safe DOM interfaces (createTextNode / property assignment) and
+// never parsed as HTML, and any URL is admitted only if it is a relative reference
+// or uses an allowed scheme; otherwise the link is rendered inert.
+const ALLOWED_URL_SCHEMES = ['http', 'https', 'mailto'];
+function safeUrl(url) {
+    const s = (url == null ? '' : String(url)).trim();
+    const m = s.match(/^([a-z][a-z0-9+.-]*):/i);
+    if (!m) return s;                                  // relative path or anchor
+    return ALLOWED_URL_SCHEMES.includes(m[1].toLowerCase()) ? s : '#';
+}
 
 // Create DB
 const db = await create({
@@ -19,7 +31,7 @@ const data_rows = await response.json();
 let i = 0;
 while (i < data_rows.length) {
     await insert(db, {
-        document: data_rows[i]["document"],
+        doc_title: data_rows[i]["doc_title"],
         doc_color: data_rows[i]["doc_color"],
         text: data_rows[i]["text"],
         heading_url: data_rows[i]["heading_url"],
@@ -66,7 +78,7 @@ async function search_onKeyUp(){
     }else{
 
         searchResult.hits.forEach ((value, index, array) =>{
-            const doc_title = value.document["document"]
+            const doc_title = value.document["doc_title"]
             const doc_color = value.document["doc_color"]
             const heading_url = value.document["heading_url"]
             const heading_text = value.document["heading_text"]
@@ -87,19 +99,20 @@ async function search_onKeyUp(){
             let cell = document.createElement("td");
             let i = document.createElement("i");
                 i.classList.add("fa","fa-file-text-o");
-                i.style.backgroundColor = "#" + doc_color;
+                if (/^[0-9a-fA-F]{3,8}$/.test(doc_color)) {
+                    i.style.backgroundColor = "#" + doc_color;
+                }
                 cell.appendChild(i);
             let textnode = document.createTextNode("\xa0" + doc_title);
             cell.appendChild(textnode);
             row.appendChild(cell)
             cell = document.createElement("td");
             
-            const a = document.createElement('a'); 
+            const a = document.createElement('a');
             const link = document.createTextNode(heading_text)
             a.appendChild(link);
             a.title = heading_text;
-            a.href = heading_url;
-            document.body.appendChild(a); 
+            a.href = safeUrl(heading_url);
 
             cell.appendChild(a);
             row.appendChild(cell)