Skip to content

Commit

Permalink
Merge branch 'trunk' into fix/en-spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
cpswan authored Feb 28, 2025
2 parents 0704e6a + 50144e1 commit da77ea3
Show file tree
Hide file tree
Showing 16 changed files with 151 additions and 50 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/c_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: c_release-${{github.run_number}}
- uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
- uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
- uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
- name: Build tarballs in Docker
run: |
docker buildx build -t atsigncompany/sshnpdc \
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
working-directory: tarballs
run: |
echo "hashes=$(cat checksums.txt | base64 -w0)" >> "$GITHUB_OUTPUT"
- uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
- uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
with:
subject-path: "tarballs/**"

Expand Down
90 changes: 90 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "trunk" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "trunk" ]
schedule:
- cron: '25 19 * * 1'

permissions: # added using https://github.com/step-security/secure-repo
contents: read

jobs:
analyze:
name: Analyze
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'c-cpp', 'javascript-typescript' ]
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Manual build steps from build_source_tests
- name: Build C sshnpd
if: ${{ matrix.language == 'c-cpp' }}
run: |
cd packages/c/sshnpd
cmake -B build -S . -DBUILD_SHARED_LIBS=off -DCMAKE_C_COMPILER=gcc \
-DCMAKE_C_FLAGS="-Wno-calloc-transposed-args -Wno-error -pthread -lrt"
cmake --build build
- name: Setup node
if: ${{ matrix.language == 'javascript-typescript' }}
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: '20.17.0'
- name: Build the admin webapp
if: ${{ matrix.language == 'javascript-typescript' }}
working-directory: ./apps/admin/webapp
run: |
npm ci
npm run build
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
with:
category: "/language:${{matrix.language}}"
14 changes: 7 additions & 7 deletions .github/workflows/dockerhub_sshnpd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
VER=${REF:11}
sed -i "0,/version:/{s/version: \(.*\)/version: "${VER}"/}" pubspec.yaml
- name: Set up QEMU
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Get version
run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Build and push
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
with:
context: .
file: ${{ matrix.dockerfile }}
Expand Down Expand Up @@ -79,9 +79,9 @@ jobs:
VER=${REF:11}
sed -i "0,/version:/{s/version: \(.*\)/version: "${VER}"/}" pubspec.yaml
- name: Set up QEMU
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
Expand All @@ -91,7 +91,7 @@ jobs:
- name: Get version
run: echo "VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Build and push
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
with:
context: .
file: ${{ matrix.dockerfile }}
Expand All @@ -113,7 +113,7 @@ jobs:
- name: sshnpd-slim
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/multibuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ jobs:
ref: multibuild-${{github.run_number}}
- name: Setup QEMU
if: ${{ ! inputs.main_build_only }}
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
- name: Setup Docker BuildX
if: ${{ ! inputs.main_build_only }}
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
- name: Run build inside of Docker
if: ${{ ! inputs.main_build_only }}
run: |
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
working-directory: tarballs
run: |
echo "hashes=$(cat checksums.txt | base64 -w0)" >> "$GITHUB_OUTPUT"
- uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
- uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
with:
subject-path: "tarballs/**"

Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/npm_build_test.yml

This file was deleted.

8 changes: 4 additions & 4 deletions apps/admin/webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/admin/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "5.0.3",
"svelte": "5.20.4",
"svelte": "5.20.5",
"vite": "6.2.0"
},
"overrides": {
Expand Down
2 changes: 1 addition & 1 deletion docs/.gitbook/includes/windows-download-installer.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ title: windows-download-installer

## Step 1: Download the installer

Download the installer [from GitHub](https://github.com/atsign-foundation/noports/releases/download/v5.8.2/NoPortsInstaller-windows-x64.zip). Then unzip the file.
Download the installer [from GitHub](https://github.com/atsign-foundation/noports/releases/download/v5.8.7/NoPortsInstaller-windows-x64.zip). Then unzip the file.
1 change: 1 addition & 0 deletions docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* [Installs at scale](installation/advanced-installation-guides/installs-at-scale.md)
* [Client installation](installation/advanced-installation-guides/client-installation-sshnp.md)
* [Client Upgrade](installation/advanced-installation-guides/client-upgrade-sshnp.md)
* [OpenWrt Installation Guide](installation/openwrt-installation-guide.md)
* [Custom OS/Device Installs](installation/custom-os-device-installs/README.md)
* [IPFire](installation/custom-os-device-installs/ipfire.md)
* [Cloud Installation Guides](installation/cloud-installation-guides/README.md)
Expand Down
34 changes: 34 additions & 0 deletions docs/installation/openwrt-installation-guide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
icon: router
description: How to install NoPorts onto an OpenWrt router.
---

# OpenWrt Installation Guide

{% embed url="https://vimeo.com/1060920058" %}
OpenWrt installation walk through
{% endembed %}

### Using the LuCI web interface

First download the latest packages for your chosen architecture from our [releases](https://github.com/atsign-foundation/Atsign_OpenWRT_packages/releases) page.

We've created packages for x86\_64, aarch64\_cortex-a53, ramips and mips\_siflower; but if your chosen architecture isn't there please let us know by opening an [issue](https://github.com/atsign-foundation/Atsign_OpenWRT_packages/issues).

With the packages ready to go, sign into the web interface for your router and go to `System`> `Software` in the menu. Click on `Upload Package` and `Browse` to the csshnpd package you downloaded. Click `Open` then `Upload` and `Install`. Repeat that process with the luci-app-csshnpd package.

For the new menu to appear you'll need to `Log out` then sign in again.

You can now go to `Network`>`NoPorts` and fill out the config tab with your device atSign, manager atSign, device name and the OTP for key generation. Click the `Enabled` box then hit `Save & Apply`.

No go to the `NoPorts Enrollment` tab and follow the instructions there to generate a device key.

With the key in place navigate to `System`>`Startup` and `Start` the `sshnpd` service.

### Command line installation

The [releases](https://github.com/atsign-foundation/Atsign_OpenWRT_packages/releases) page includes instructions for command line installation, though these may need to be edited to suit your system architecture.

Those command line snippets set some variables for the `RELEASE` number and `PACKAGE` name then use `wget` to download the package from GitHub.

Packages are installed using `opkg install` for OpenWrt 24.10 and earlier releases that use `.ipk` type packages, or `apk add` for newer OpenWrt which uses `.apk` packages.
2 changes: 1 addition & 1 deletion docs/reference/policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ description: >-

<figure><img src="../.gitbook/assets/NoPorts Policy Diagrams.png" alt=""><figcaption><p>High level overview of the NoPorts architecture</p></figcaption></figure>

The NoPorts Policy Service is currently in alpha status. [Schedule a call](https://calendly.com/noports/speak-to-an-engineer) with one of our engineers to become an alpha tester.
The NoPorts Policy Service is currently in alpha status. [Schedule a call](https://calendly.com/noports/installation-help) with one of our engineers to become an alpha tester.
2 changes: 1 addition & 1 deletion packages/dart/sshnoports/tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile
# Build image for a containerized instance of sshnpd

FROM dart:3.7.0@sha256:9fb41fc1eefdf432694e17b0f80c9135b1f79dd3f645c403f98ed5ae71799c36 AS buildimage
FROM dart:3.7.1@sha256:5d40556368d94af9a1b41447cf1e5635dec18dc3f52c66096e1561be6580a321 AS buildimage
ENV PACKAGEDIR=packages/dart/sshnoports
ENV BINARYDIR=/usr/local/at
SHELL ["/bin/bash", "-c"]
Expand Down
2 changes: 1 addition & 1 deletion packages/dart/sshnoports/tools/Dockerfile.activate
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dockerfile.activate
# Build image for a containerized call of the at_activate binary
FROM dart:3.7.0@sha256:9fb41fc1eefdf432694e17b0f80c9135b1f79dd3f645c403f98ed5ae71799c36 AS buildimage
FROM dart:3.7.1@sha256:5d40556368d94af9a1b41447cf1e5635dec18dc3f52c66096e1561be6580a321 AS buildimage
ENV PACKAGEDIR=packages/dart/sshnoports
ENV BINARYDIR=/usr/local/at
SHELL ["/bin/bash", "-c"]
Expand Down
2 changes: 1 addition & 1 deletion packages/dart/sshnoports/tools/Dockerfile.sshnpd-slim
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# as of 5th Feb 2024 - Will check state as 3.3 Stable is released
#FROM dart:beta-sdk AS buildimage

FROM dart:3.7.0@sha256:9fb41fc1eefdf432694e17b0f80c9135b1f79dd3f645c403f98ed5ae71799c36 AS buildimage
FROM dart:3.7.1@sha256:5d40556368d94af9a1b41447cf1e5635dec18dc3f52c66096e1561be6580a321 AS buildimage
ARG TARGETARCH
ENV PACKAGEDIR=packages/dart/sshnoports
ENV OPENSSH=tools/static-openssh
Expand Down
4 changes: 2 additions & 2 deletions tests/end2end_tests/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN set -eux ; \

# BRANCH
# BUILD BRANCH
FROM dart:3.7.0@sha256:9fb41fc1eefdf432694e17b0f80c9135b1f79dd3f645c403f98ed5ae71799c36 AS build-branch
FROM dart:3.7.1@sha256:5d40556368d94af9a1b41447cf1e5635dec18dc3f52c66096e1561be6580a321 AS build-branch

ENV URL=https://github.com/atsign-foundation/noports.git
ENV REPO_DIR=/app/repo
Expand Down Expand Up @@ -65,7 +65,7 @@ ENTRYPOINT cp -r /mount/. ${HOMEDIR} && sudo service ssh start && sh ${HOMEDIR}/

# LOCAL
# BUILD LOCAL
FROM dart:3.7.0@sha256:9fb41fc1eefdf432694e17b0f80c9135b1f79dd3f645c403f98ed5ae71799c36 AS build-local
FROM dart:3.7.1@sha256:5d40556368d94af9a1b41447cf1e5635dec18dc3f52c66096e1561be6580a321 AS build-local

ENV REPO_DIR=/app/repo
ENV PACKAGE_DIR=${REPO_DIR}/packages/dart/sshnoports
Expand Down
2 changes: 1 addition & 1 deletion tools/multibuild/Dockerfile.package
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile.package
# A dockerfile for packaging SSH No Ports releases using docker buildx

FROM atsigncompany/buildimage:3.7.0@sha256:6fa08a2b226ab51ac3ff3ce86e55e8cd1893ed484f451b39e7595f269ddb3d6d AS build
FROM atsigncompany/buildimage:3.7.1@sha256:108989aaaebeb56ceaf2744aa55dadba3a38db10311300140594e6d807bf3bf6 AS build
# Using atsigncompany/buildimage until official dart image has RISC-V support
# See https://github.com/atsign-company/at_dockerfiles for source and automated builds
WORKDIR /noports
Expand Down

0 comments on commit da77ea3

Please sign in to comment.