From 9c8f8d434c894e9d8dc3528cee6b68051ab38254 Mon Sep 17 00:00:00 2001 From: Aditya Sirish Date: Fri, 20 Jan 2023 15:56:43 -0500 Subject: [PATCH 1/4] Add requirements.txt file Signed-off-by: Aditya Sirish --- .github/workflows/test_yaml.yml | 2 +- requirements.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 requirements.txt diff --git a/.github/workflows/test_yaml.yml b/.github/workflows/test_yaml.yml index 8eca324..f9146e5 100644 --- a/.github/workflows/test_yaml.yml +++ b/.github/workflows/test_yaml.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install yamale colorama + python -m pip install -r requirements.txt - name: Test yaml run: | _test/test_yaml.py diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..5d766d5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +colorama==0.4.6 +PyYAML==6.0 +yamale==4.0.4 From 43787c80c5088b7f801b90b7c73bc51759f73928 Mon Sep 17 00:00:00 2001 From: Aditya Sirish Date: Fri, 20 Jan 2023 15:59:09 -0500 Subject: [PATCH 2/4] Add tag identifying project status type Signed-off-by: Aditya Sirish --- _data/data.yml | 4 ++++ _test/data/test_01_projects_vs_project.yml | 1 + _test/data/test_02_project_list_vs_str.yml | 1 + _test/data/test_03_misspelled_alias.yml | 1 + _test/data/test_04_unescaped_quotes.yml | 1 + _test/data/test_05_alias_instead_of_str.yml | 1 + _test/data/test_data.yml | 1 + _test/yamale_schema.yml | 2 +- 8 files changed, 11 insertions(+), 1 deletion(-) diff --git a/_data/data.yml b/_data/data.yml index e555007..593e714 100644 --- a/_data/data.yml +++ b/_data/data.yml @@ -701,15 +701,19 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." - &starting name: Sprouting + tag: "sprouting" description: "We're ready for use. Early adopters wanted!" - &adopted name: Adopted + tag: "adopted" description: "Many people are using this. Join them!" - &retired name: Retired + tag: "retired" description: "We learned what we can and are not actively developing anymore." tags: diff --git a/_test/data/test_01_projects_vs_project.yml b/_test/data/test_01_projects_vs_project.yml index 87d2dc6..f246ce7 100644 --- a/_test/data/test_01_projects_vs_project.yml +++ b/_test/data/test_01_projects_vs_project.yml @@ -26,6 +26,7 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." tags: diff --git a/_test/data/test_02_project_list_vs_str.yml b/_test/data/test_02_project_list_vs_str.yml index d338cbc..33d7459 100644 --- a/_test/data/test_02_project_list_vs_str.yml +++ b/_test/data/test_02_project_list_vs_str.yml @@ -26,6 +26,7 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." tags: diff --git a/_test/data/test_03_misspelled_alias.yml b/_test/data/test_03_misspelled_alias.yml index 2f20fc8..c4e7c17 100644 --- a/_test/data/test_03_misspelled_alias.yml +++ b/_test/data/test_03_misspelled_alias.yml @@ -26,6 +26,7 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." tags: diff --git a/_test/data/test_04_unescaped_quotes.yml b/_test/data/test_04_unescaped_quotes.yml index fe727a3..88b4b20 100644 --- a/_test/data/test_04_unescaped_quotes.yml +++ b/_test/data/test_04_unescaped_quotes.yml @@ -26,6 +26,7 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." tags: diff --git a/_test/data/test_05_alias_instead_of_str.yml b/_test/data/test_05_alias_instead_of_str.yml index 7415cd9..63cb0e7 100644 --- a/_test/data/test_05_alias_instead_of_str.yml +++ b/_test/data/test_05_alias_instead_of_str.yml @@ -26,6 +26,7 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." tags: diff --git a/_test/data/test_data.yml b/_test/data/test_data.yml index 10a72a4..fc60978 100644 --- a/_test/data/test_data.yml +++ b/_test/data/test_data.yml @@ -26,6 +26,7 @@ projects: statuses: - &stealth name: "Stealth Mode" + tag: "stealth" description: "Shhhh. We're still figuring things out internally." tags: diff --git a/_test/yamale_schema.yml b/_test/yamale_schema.yml index daf07f5..4ef4ab1 100644 --- a/_test/yamale_schema.yml +++ b/_test/yamale_schema.yml @@ -29,7 +29,6 @@ person: since: any(int(min=2010,max=2025), str()) interests: str() photo: str() - interests: str() publications: list(include('person_publication'), required=False) deployments: str(required=False) @@ -59,6 +58,7 @@ proj_person: status: name: str() + tag: str() description: str() tag: From c85c3d06e57546e2c31bd59fa494f56ba010969c Mon Sep 17 00:00:00 2001 From: Aditya Sirish Date: Fri, 20 Jan 2023 15:59:45 -0500 Subject: [PATCH 3/4] Skip listing projects that are retired Signed-off-by: Aditya Sirish --- _data/data.yml | 8 ++-- js/project_tags.js | 3 ++ js/retired_project_tags.js | 18 +++++++ projects.html | 17 +++++++ retired-projects.html | 97 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 js/retired_project_tags.js create mode 100644 retired-projects.html diff --git a/_data/data.yml b/_data/data.yml index 593e714..cc32329 100644 --- a/_data/data.yml +++ b/_data/data.yml @@ -748,10 +748,10 @@ projects: name: "Testing Tools" anchor: testing_tools - intro: "Though all of SSL’s research initiatives—past and present—revolve - around ensuring secure operation of computer systems, the specific areas - addressed by the team vary greatly. Initiatives are grouped into - the following categories:" + intro: "Though all of SSL’s research initiatives—past + and present—revolve around ensuring secure operation + of computer systems, the specific areas addressed by the team vary greatly. + Initiatives are grouped into the following categories:" projects: - &tuf diff --git a/js/project_tags.js b/js/project_tags.js index 2d3379a..86e12c0 100644 --- a/js/project_tags.js +++ b/js/project_tags.js @@ -5,6 +5,9 @@ // Populate a master hash with the mapping of tag_name=>project_name {% for project in site.data.data.projects.project_cards %} + {% if project.status.tag == "retired" %} + {% continue %} + {% endif %} {% for tag in project.tags %} mapTagToAnchor( '{{ tag.anchor }}', '{{ project.anchor }}'); mapTagToPrettyName('{{ tag.anchor }}', '{{ tag.name }}'); diff --git a/js/retired_project_tags.js b/js/retired_project_tags.js new file mode 100644 index 0000000..57368a8 --- /dev/null +++ b/js/retired_project_tags.js @@ -0,0 +1,18 @@ +--- +--- + +{% include filter_tags_preamble.js %} + +// Populate a master hash with the mapping of tag_name=>project_name +{% for project in site.data.data.projects.project_cards %} + {% if project.status.tag != "retired" %} + {% continue %} + {% endif %} + {% for tag in project.tags %} + mapTagToAnchor( '{{ tag.anchor }}', '{{ project.anchor }}'); + mapTagToPrettyName('{{ tag.anchor }}', '{{ tag.name }}'); + {% endfor %} +{% endfor %} + +{% include filter_tags.js pagename='project' %} + diff --git a/projects.html b/projects.html index 683e947..6988a3d 100644 --- a/projects.html +++ b/projects.html @@ -12,6 +12,12 @@
{% for project in site.data.data.projects.project_cards %} + {% if project.status %} + + {% if project.status.tag == "retired" %} + {% continue %} + {% endif %} + {% endif %}
@@ -84,6 +90,17 @@

{{ project.name | size_upcase }}

{% endfor %} +
+

+ During its tenure, the Secure Systems Laboratory has developed, nurtured, and deployed a number of technologies, + which have been sunsetted. These projects addressed password protection, secure experimental testbeds, the + factors that influence developer perceptions, as well as a vehicle to securely share (and acquire) donated computing + resources from desktops, laptops, or smartphones that in some ways anticipated the growth of cloud computing. Though + these technologies are no longer being actively developed, the resources generated by these projects can still + largely be accessed. You can learn more about these retired technologies by clicking here. +

+
diff --git a/retired-projects.html b/retired-projects.html new file mode 100644 index 0000000..76145ef --- /dev/null +++ b/retired-projects.html @@ -0,0 +1,97 @@ +--- +title: Retired Projects +subnav: retired-projects +layout: default +--- + + + +
{{ site.data.data.projects.intro }}
+ +
    + +
    + {% for project in site.data.data.projects.project_cards %} + {% if project.status %} + + {% if project.status.tag != "retired" %} + {% continue %} + {% endif %} + {% endif %} +
    + + +
    +

    {{ project.name | size_upcase }}

    +
    +
    + {% capture press_projects %}{{ site.data.data.press.presses | map: 'project' | map: 'anchor' }}{% endcapture %} + {% if press_projects contains project.anchor %} + (press) + {% endif %} +
    +
    + {% capture pub_projects %}{{ site.data.data.publications.publications | map: 'project' | map: 'anchor' }}{% endcapture %} + {% if pub_projects contains project.anchor %} + (publications) + {% endif %} +
    +
    + {% if project.site %} + (website) + {% endif %} +
    +
    + {% if project.status %} + {{ project.status.name }} +
    {{ project.status.description }}
    +     + {% endif %} +
    + {% if project.tags %} +
    + {{ project.tags | map: 'name' | array_to_sentence_string }} +
    + {% endif %} + + + +

    + {{ project.description }} +

    + +
      + {% if project.products %} +
    • + Products: + {{ project.products }} +
      • + {% endif %} + + {% if project.people %} +
      +
    • + People: + {% assign personLinks = '' | split:':' %} + {% for person in project.people %} + {% if person == nil %} + {% capture personLink %}NAME MISSING{% endcapture %} + {% else %} + {% assign defaultLink = "people#" | append: person.anchor %} + {% capture personLink %}{% if person.link or person.anchor %}{% endif %}{{ person.name }}{% if person.link %}{% endif %}{% endcapture %} + {% endif %} + {% assign personLinks = personLinks | push: personLink %} + {% endfor %} + + {{ personLinks | array_to_sentence_string }} +
      • + {% endif %} +
    +
    + {% endfor %} +
    + +
    + + From d7011017125d63db8c9f7d4bf51fab737e728f84 Mon Sep 17 00:00:00 2001 From: Aditya Sirish Date: Fri, 20 Jan 2023 16:43:23 -0500 Subject: [PATCH 4/4] Add bundle to gitignore Signed-off-by: Aditya Sirish --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8d45318..3f46622 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,6 @@ node_modules # Jekyll .jekyll-metadata .jekyll-cache + +# Ruby +.bundle \ No newline at end of file