mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Compare commits
7
Commits
v2026.11.4
...
v2026.11.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
291990412e | ||
|
|
a2672b99a3 | ||
|
|
908c943e21 | ||
|
|
5876c07a1a | ||
|
|
faae719b12 | ||
|
|
e199e6feeb | ||
|
|
d4b71d17a1 |
No files matched your search
+22
-5
@@ -2,10 +2,11 @@
|
|||||||
# block is required. Every setting is explained in the README.
|
# block is required. Every setting is explained in the README.
|
||||||
|
|
||||||
# --- Required ----------------------------------------------------------
|
# --- Required ----------------------------------------------------------
|
||||||
# Generate with: bin/rails secret (or: openssl rand -hex 64)
|
# Generate with: bin/rails secret (or: openssl rand -hex 64). Anyone who knows
|
||||||
# Keep a copy somewhere safe off the server: signatures and stored secrets
|
# it can sign in as anyone, so the app won't start with a placeholder or a
|
||||||
# depend on it, and a restore needs the same one.
|
# short one. Keep a copy somewhere safe off the server: signatures and stored
|
||||||
SECRET_KEY_BASE=change-me
|
# secrets depend on it, and a restore needs the same one.
|
||||||
|
SECRET_KEY_BASE=
|
||||||
# The host name people use to reach the app (used in email links).
|
# The host name people use to reach the app (used in email links).
|
||||||
APP_HOST=aircraft.example.com
|
APP_HOST=aircraft.example.com
|
||||||
|
|
||||||
@@ -13,9 +14,20 @@ APP_HOST=aircraft.example.com
|
|||||||
# their own zone, from Profile or their device). Default UTC.
|
# their own zone, from Profile or their device). Default UTC.
|
||||||
# TZ=America/New_York
|
# TZ=America/New_York
|
||||||
# true: the app redirects to HTTPS and sets secure cookies (use behind a TLS
|
# true: the app redirects to HTTPS and sets secure cookies (use behind a TLS
|
||||||
# proxy such as Traefik, Caddy or Cloudflare Tunnel). false: plain HTTP on a LAN.
|
# proxy such as Traefik, Caddy or Cloudflare Tunnel, or with TLS_DOMAIN).
|
||||||
|
# false: plain HTTP, only on a private network: passwords travel unencrypted.
|
||||||
FORCE_SSL=true
|
FORCE_SSL=true
|
||||||
|
|
||||||
|
# --- HTTPS without a proxy (docker-compose.direct.yml) -------------------
|
||||||
|
# The app gets a Let's Encrypt certificate for this name itself (ports 80
|
||||||
|
# and 443 must reach it).
|
||||||
|
# TLS_DOMAIN=aircraft.example.com
|
||||||
|
|
||||||
|
# --- Allowed addresses ---------------------------------------------------
|
||||||
|
# Requests are answered only for APP_HOST (and the APP_URL host), localhost
|
||||||
|
# and IP addresses. Other names that should work, comma-separated:
|
||||||
|
# ALLOWED_HOSTS=sam.lan,aircraft.home.arpa
|
||||||
|
|
||||||
# --- Address -----------------------------------------------------------
|
# --- Address -----------------------------------------------------------
|
||||||
# Full public URL, if it isn't https://APP_HOST (used for the single sign-on
|
# Full public URL, if it isn't https://APP_HOST (used for the single sign-on
|
||||||
# and Google Drive redirect URIs).
|
# and Google Drive redirect URIs).
|
||||||
@@ -37,6 +49,11 @@ FORCE_SSL=true
|
|||||||
# OIDC_AUTO_CREATE_USERS=false # true: create an account at first sign-in
|
# OIDC_AUTO_CREATE_USERS=false # true: create an account at first sign-in
|
||||||
# OIDC_TRUST_EMAIL=false # true: link accounts by unverified email
|
# OIDC_TRUST_EMAIL=false # true: link accounts by unverified email
|
||||||
# OIDC_ADMIN_GROUP= # members become admins (synced at sign-in)
|
# OIDC_ADMIN_GROUP= # members become admins (synced at sign-in)
|
||||||
|
|
||||||
|
# --- AirTrail ------------------------------------------------------------
|
||||||
|
# AirTrail servers on your private network that everyone may connect to
|
||||||
|
# (admins can always use private addresses), comma-separated host names:
|
||||||
|
# AIRTRAIL_ALLOWED_HOSTS=airtrail.lan
|
||||||
# PASSWORD_LOGIN=true # false: SSO only (invited mechanics then can't sign in)
|
# PASSWORD_LOGIN=true # false: SSO only (invited mechanics then can't sign in)
|
||||||
|
|
||||||
# --- Sign-in security ----------------------------------------------------
|
# --- Sign-in security ----------------------------------------------------
|
||||||
|
|||||||
@@ -2,6 +2,30 @@
|
|||||||
|
|
||||||
Each release has a **version** (year.month.release, e.g. 2026.11.0) and a **build** (the exact source commit, shown on Admin → About). The newest release is first.
|
Each release has a **version** (year.month.release, e.g. 2026.11.0) and a **build** (the exact source commit, shown on Admin → About). The newest release is first.
|
||||||
|
|
||||||
|
## 2026.11.5
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
|
||||||
|
- **Faster photos.** Aircraft photos load as small copies on the Fleet page and the aircraft header (they were the full original, slow on mobile). The offline copies use the small versions too.
|
||||||
|
- **Detail cards read one item per row on a phone**: flights, engine data, components and major repairs and alterations. Wider screens show two columns.
|
||||||
|
- **Profile uses the width of a desktop screen**: your account and its security on the left; calendar, certificates, this device and integrations on the right.
|
||||||
|
- **Notifications:** opening Profile on a device records its notification subscription again, so a device whose subscription was never saved starts receiving them. **Send test** lists each device and whether its push service accepted the notification, with the reason if not. If turning notifications on fails, the browser's error is shown.
|
||||||
|
|
||||||
|
### For administrators
|
||||||
|
|
||||||
|
- **The app won't start with a placeholder or short `SECRET_KEY_BASE`** (under 32 characters), since anyone who knows it can sign in as anyone. `sam:doctor` flags one under 64 characters. Use the output of `bin/rails secret`.
|
||||||
|
- **First-run setup asks for a one-time code** printed in the server log (`docker compose logs web | grep "Setup code"`), so only whoever runs the server can create the admin account.
|
||||||
|
- **HTTPS without a proxy:** `docker-compose.direct.yml` with `TLS_DOMAIN` gets and renews a Let's Encrypt certificate by itself.
|
||||||
|
- **The app answers only for its own names** when `APP_HOST` is set: `APP_HOST`, the `APP_URL` host, `localhost`, IP addresses, and any names listed in the new `ALLOWED_HOSTS`. Other names get a short explanation. If you reach the app by another name (such as a LAN name), add it to `ALLOWED_HOSTS`.
|
||||||
|
- **AirTrail servers on a private network** can be connected only by an administrator, or by anyone when listed in `AIRTRAIL_ALLOWED_HOSTS`. The server itself and link-local addresses are always refused.
|
||||||
|
- The project is released into the public domain (LICENSE, The Unlicense).
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
|
||||||
|
- A file that isn't a photo, or an empty one, chosen as the aircraft photo now shows "must be an image" instead of an error page. An image that can't be read is shown as the original file.
|
||||||
|
- A component can't be set as a part of its own parts; that made the logbook entry and squawk resolution pages fail.
|
||||||
|
- Many malformed requests that caused error pages now get a proper answer: pages requested in another format, blank required values, links to records that don't exist, numbers too large to store, and text sent where a file belongs.
|
||||||
|
|
||||||
## 2026.11.4
|
## 2026.11.4
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
This is free and unencumbered software released into the public domain.
|
||||||
|
|
||||||
|
Anyone is free to copy, modify, publish, use, compile, sell, or
|
||||||
|
distribute this software, either in source code form or as a compiled
|
||||||
|
binary, for any purpose, commercial or non-commercial, and by any
|
||||||
|
means.
|
||||||
|
|
||||||
|
In jurisdictions that recognize copyright laws, the author or authors
|
||||||
|
of this software dedicate any and all copyright interest in the
|
||||||
|
software to the public domain. We make this dedication for the benefit
|
||||||
|
of the public at large and to the detriment of our heirs and
|
||||||
|
successors. We intend this dedication to be an overt act of
|
||||||
|
relinquishment in perpetuity of all present and future rights to this
|
||||||
|
software under copyright law.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
|
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||||
|
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||||
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
For more information, please refer to <https://unlicense.org>
|
||||||
@@ -33,7 +33,7 @@ bin/dev # http://localhost:3000
|
|||||||
```
|
```
|
||||||
|
|
||||||
With demo data, sign in as `admin@example.com` / `demo-password-123` (admin, owner of N12345) or `pilot@example.com` / `demo-password-123` (pilot).
|
With demo data, sign in as `admin@example.com` / `demo-password-123` (admin, owner of N12345) or `pilot@example.com` / `demo-password-123` (pilot).
|
||||||
Without demo data, the first visit asks you to create the admin account.
|
Without demo data, the first visit asks you to create the admin account. It needs the one-time setup code printed in the server's log (the line starting `Setup code`), so only whoever runs the server can claim it.
|
||||||
|
|
||||||
Run the tests: `bin/rails test`
|
Run the tests: `bin/rails test`
|
||||||
|
|
||||||
@@ -48,11 +48,14 @@ cp .env.example .env # set SECRET_KEY_BASE (bin/rails secret), APP_HOST
|
|||||||
docker compose up -d --build # http://<host>:3000
|
docker compose up -d --build # http://<host>:3000
|
||||||
```
|
```
|
||||||
|
|
||||||
Data lives in the `sam_storage` volume. Set `FORCE_SSL=false` if you serve plain HTTP on a LAN. Set it to `true` when a TLS reverse proxy such as Caddy, Traefik, or Cloudflare Tunnel sits in front.
|
Data lives in the `sam_storage` volume. Set `FORCE_SSL=false` only if you serve plain HTTP on a private network: passwords and sign-in cookies then travel unencrypted. Set it to `true` when a TLS reverse proxy such as Caddy, Traefik, or Cloudflare Tunnel sits in front, or use the built-in HTTPS below.
|
||||||
|
|
||||||
|
The first visit asks for the setup code from the log: `docker compose logs web | grep "Setup code"`.
|
||||||
|
|
||||||
Other examples in the repository:
|
Other examples in the repository:
|
||||||
|
|
||||||
- [`docker-compose.image.yml`](docker-compose.image.yml): runs the published image (`barrettefab/simple-aircraft-manager-rails` on Docker Hub) without cloning the source, with a health check and update steps.
|
- [`docker-compose.image.yml`](docker-compose.image.yml): runs the published image (`barrettefab/simple-aircraft-manager-rails` on Docker Hub) without cloning the source, with a health check and update steps.
|
||||||
|
- [`docker-compose.direct.yml`](docker-compose.direct.yml): directly on the internet with HTTPS and no proxy. The image's web server gets and renews a Let's Encrypt certificate for `TLS_DOMAIN` by itself (ports 80 and 443 must reach the server).
|
||||||
- [`docker-compose.traefik.yml`](docker-compose.traefik.yml): behind Traefik with HTTPS, with optional Authentik forward auth (see [Running behind Authentik](docs/authentik.md)).
|
- [`docker-compose.traefik.yml`](docker-compose.traefik.yml): behind Traefik with HTTPS, with optional Authentik forward auth (see [Running behind Authentik](docs/authentik.md)).
|
||||||
|
|
||||||
[`.env.example`](.env.example) lists every setting, grouped and commented. After starting or updating, `docker compose exec web bin/rails sam:doctor` checks the installation.
|
[`.env.example`](.env.example) lists every setting, grouped and commented. After starting or updating, `docker compose exec web bin/rails sam:doctor` checks the installation.
|
||||||
@@ -69,9 +72,12 @@ The app is a standard Rails app. Run `bin/rails db:prepare && bin/thrust bin/rai
|
|||||||
|
|
||||||
| Variable | Purpose |
|
| Variable | Purpose |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `SECRET_KEY_BASE` | Required in production (`bin/rails secret`). Alternatively provide `RAILS_MASTER_KEY`. |
|
| `SECRET_KEY_BASE` | Required in production (`bin/rails secret`). Anyone who knows it can sign in as anyone, so the app won't start with a placeholder or one under 32 characters, and `sam:doctor` flags one under 64. Alternatively provide `RAILS_MASTER_KEY`. |
|
||||||
| `FORCE_SSL` | `true` (default) redirects to HTTPS and sets secure cookies. Use `false` for plain HTTP. |
|
| `FORCE_SSL` | `true` (default) redirects to HTTPS and sets secure cookies. Use `false` for plain HTTP, only on a private network. |
|
||||||
| `APP_HOST` | Host name the app is reached at, used in email links (password resets, sign-in links, signing invitations, reminders). |
|
| `TLS_DOMAIN` | Optional. HTTPS without a proxy: the app gets a Let's Encrypt certificate for this name (see `docker-compose.direct.yml`). |
|
||||||
|
| `APP_HOST` | Host name the app is reached at, used in email links (password resets, sign-in links, signing invitations, reminders). When set, the app answers only for this name, the `APP_URL` host, `ALLOWED_HOSTS`, `localhost` and IP addresses. |
|
||||||
|
| `ALLOWED_HOSTS` | Optional. Other names the app may be reached by, comma-separated (e.g. a LAN name). |
|
||||||
|
| `AIRTRAIL_ALLOWED_HOSTS` | Optional. AirTrail servers on your private network that anyone may connect to, comma-separated. Admins can always connect to private addresses; nobody can use the server itself or link-local addresses. |
|
||||||
| `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable email: password resets and **Email me a sign-in link**. Without them an admin resets passwords from **Users**. Check the setup with **Admin → About → Send test email**. |
|
| `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable email: password resets and **Email me a sign-in link**. Without them an admin resets passwords from **Users**. Check the setup with **Admin → About → Send test email**. |
|
||||||
| `SMTP_TLS` | `true` for servers that use TLS from the start. That's the default on port 465; other ports upgrade with STARTTLS. |
|
| `SMTP_TLS` | `true` for servers that use TLS from the start. That's the default on port 465; other ports upgrade with STARTTLS. |
|
||||||
| `VAPID_PUBLIC_KEY`, `VAPID_PRIVATE_KEY` | Optional. The key pair that signs push notifications (generate with `bin/rails runner 'k = WebPush.generate_key; puts k.public_key, k.private_key'`). Without them the app generates a pair once and keeps it in `storage/vapid_keys.json`. Changing it turns notifications off on every device until they're turned on again. |
|
| `VAPID_PUBLIC_KEY`, `VAPID_PRIVATE_KEY` | Optional. The key pair that signs push notifications (generate with `bin/rails runner 'k = WebPush.generate_key; puts k.public_key, k.private_key'`). Without them the app generates a pair once and keeps it in `storage/vapid_keys.json`. Changing it turns notifications off on every device until they're turned on again. |
|
||||||
|
|||||||
@@ -184,3 +184,9 @@
|
|||||||
.btn-sm { padding: 0.4rem 0.75rem; font-size: 0.8125rem; }
|
.btn-sm { padding: 0.4rem 0.75rem; font-size: 0.8125rem; }
|
||||||
.btn-primary, .btn-secondary, .btn-danger { min-height: 2.5rem; }
|
.btn-primary, .btn-secondary, .btn-danger { min-height: 2.5rem; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A label and its value on one row (label column, then value), e.g. a flight's details. */
|
||||||
|
@utility detail-row {
|
||||||
|
@apply grid grid-cols-[6.5rem_minmax(0,1fr)] items-baseline gap-x-3;
|
||||||
|
& > dt { @apply text-slate-500; }
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ class AircraftImportsController < ApplicationController
|
|||||||
|
|
||||||
def create
|
def create
|
||||||
file = params[:archive]
|
file = params[:archive]
|
||||||
return redirect_to(new_aircraft_import_path, alert: t("flash.aircraft_imports.choose_a_sam_zip")) if file.blank?
|
return redirect_to(new_aircraft_import_path, alert: t("flash.aircraft_imports.choose_a_sam_zip")) unless file.respond_to?(:tempfile)
|
||||||
|
|
||||||
preview = AircraftArchive::Importer.check(file.tempfile.path)
|
preview = AircraftArchive::Importer.check(file.tempfile.path)
|
||||||
tail = params[:tail_number].to_s.strip.upcase.presence || preview.tail_number.to_s.upcase
|
tail = params[:tail_number].to_s.strip.upcase.presence || preview.tail_number.to_s.upcase
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
|
|||||||
allow_browser versions: :modern
|
allow_browser versions: :modern
|
||||||
|
|
||||||
prepend_before_action :redirect_to_setup
|
prepend_before_action :redirect_to_setup
|
||||||
|
prepend_before_action :reject_null_bytes
|
||||||
before_action { Current.ip_address = request.remote_ip } # for record history
|
before_action { Current.ip_address = request.remote_ip } # for record history
|
||||||
helper_method :current_user
|
helper_method :current_user
|
||||||
|
|
||||||
@@ -15,8 +16,41 @@ class ApplicationController < ActionController::Base
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Asked for a format a page doesn't have (/aircraft/1/report.pdf): not a crash.
|
||||||
|
rescue_from ActionView::MissingTemplate do |error|
|
||||||
|
raise error if request.format.html?
|
||||||
|
head :not_acceptable
|
||||||
|
end
|
||||||
|
|
||||||
|
# Input no form produces: a tampered upload reference, a number too big to
|
||||||
|
# store, a missing required value or a link to a record that isn't there.
|
||||||
|
# The forms validate what people can enter; this is the safety net.
|
||||||
|
rescue_from ActiveSupport::MessageVerifier::InvalidSignature, ActiveModel::RangeError,
|
||||||
|
ActiveRecord::NotNullViolation, ActiveRecord::InvalidForeignKey do |error|
|
||||||
|
Rails.logger.warn("[input] #{error.class}: #{error.message.truncate(200)}")
|
||||||
|
respond_to do |format|
|
||||||
|
format.html { redirect_back_or_to root_path, alert: t("flash.application.invalid_input") }
|
||||||
|
format.any { head :unprocessable_entity }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
# No form sends a null byte; some libraries (password hashing, file paths)
|
||||||
|
# raise on one, so refuse the request up front.
|
||||||
|
def reject_null_bytes
|
||||||
|
head :bad_request if contains_null_byte?(request.params)
|
||||||
|
end
|
||||||
|
|
||||||
|
def contains_null_byte?(value)
|
||||||
|
case value
|
||||||
|
when String then value.include?("\0")
|
||||||
|
when Hash then value.any? { |k, v| contains_null_byte?(k) || contains_null_byte?(v) }
|
||||||
|
when Array then value.any? { contains_null_byte?(_1) }
|
||||||
|
else false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def current_user = Current.user
|
def current_user = Current.user
|
||||||
|
|
||||||
# First run: no users yet → create the initial admin.
|
# First run: no users yet → create the initial admin.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class LogbookImportsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
files = Array(params[:pages]).compact_blank
|
files = Array(params[:pages]).select { _1.respond_to?(:original_filename) } # uploaded files only
|
||||||
return redirect_to(new_aircraft_logbook_import_path(@aircraft), alert: t("flash.logbook_imports.choose_the_scanned_pages")) if files.empty?
|
return redirect_to(new_aircraft_logbook_import_path(@aircraft), alert: t("flash.logbook_imports.choose_the_scanned_pages")) if files.empty?
|
||||||
|
|
||||||
# Page order follows the file names ("page-002" before "page-010").
|
# Page order follows the file names ("page-002" before "page-010").
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class OilAnalysesController < ApplicationController
|
|||||||
# earlier samples, so samples already on file are skipped rather than duplicated.
|
# earlier samples, so samples already on file are skipped rather than duplicated.
|
||||||
def import
|
def import
|
||||||
file = params[:report]
|
file = params[:report]
|
||||||
return redirect_to(new_aircraft_oil_analysis_path(@aircraft), alert: t("flash.oil_analyses.choose_a_lab_report")) if file.blank?
|
return redirect_to(new_aircraft_oil_analysis_path(@aircraft), alert: t("flash.oil_analyses.choose_a_lab_report")) unless file.respond_to?(:tempfile)
|
||||||
|
|
||||||
report = OilReportParser.from_pdf(file.tempfile)
|
report = OilReportParser.from_pdf(file.tempfile)
|
||||||
file.rewind
|
file.rewind
|
||||||
|
|||||||
@@ -6,7 +6,13 @@ class PushSubscriptionsController < ApplicationController
|
|||||||
record = PushSubscription.find_or_initialize_by(endpoint: sub[:endpoint].to_s)
|
record = PushSubscription.find_or_initialize_by(endpoint: sub[:endpoint].to_s)
|
||||||
record.assign_attributes(user: current_user, p256dh: sub.dig(:keys, :p256dh), auth: sub.dig(:keys, :auth),
|
record.assign_attributes(user: current_user, p256dh: sub.dig(:keys, :p256dh), auth: sub.dig(:keys, :auth),
|
||||||
user_agent: request.user_agent.to_s.first(250))
|
user_agent: request.user_agent.to_s.first(250))
|
||||||
record.save ? head(:created) : head(:unprocessable_entity)
|
if record.save
|
||||||
|
head :created
|
||||||
|
else
|
||||||
|
render json: { error: t("flash.push_subscriptions.not_saved", host: URI.parse(record.endpoint).host.to_s) }, status: :unprocessable_entity
|
||||||
|
end
|
||||||
|
rescue URI::InvalidURIError
|
||||||
|
render json: { error: t("flash.push_subscriptions.not_saved", host: "?") }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@@ -14,9 +20,35 @@ class PushSubscriptionsController < ApplicationController
|
|||||||
head :no_content
|
head :no_content
|
||||||
end
|
end
|
||||||
|
|
||||||
# A notification to this user's devices, to check they arrive.
|
# A notification to each of this user's devices, sent now so the page can
|
||||||
|
# say which push services took it (and why one didn't).
|
||||||
def test
|
def test
|
||||||
PushNotifier.notify(current_user, :test, path: edit_profile_path, tag: "test")
|
message = PushNotificationJob.message("test", edit_profile_path, "test")
|
||||||
head :accepted
|
devices = current_user.push_subscriptions.order(:created_at).map do |sub|
|
||||||
|
{ device: device_name(sub.user_agent), error: PushNotificationJob.deliver(sub, message) }
|
||||||
|
end
|
||||||
|
render json: { devices: devices }
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
# "Chrome on Android" from the browser's description of itself.
|
||||||
|
def device_name(agent)
|
||||||
|
browser = case agent
|
||||||
|
when /Edg\//, /EdgA\// then "Edge"
|
||||||
|
when /SamsungBrowser/ then "Samsung Internet"
|
||||||
|
when /Firefox|FxiOS/ then "Firefox"
|
||||||
|
when /Chrome|CriOS/ then "Chrome"
|
||||||
|
when /Safari/ then "Safari"
|
||||||
|
end
|
||||||
|
system = case agent
|
||||||
|
when /Android/ then "Android"
|
||||||
|
when /iPhone/ then "iPhone"
|
||||||
|
when /iPad/ then "iPad"
|
||||||
|
when /Macintosh/ then "Mac"
|
||||||
|
when /Windows/ then "Windows"
|
||||||
|
when /Linux/ then "Linux"
|
||||||
|
end
|
||||||
|
[ browser, system ].compact.join(" · ").presence || t("flash.push_subscriptions.unknown_device")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -1,16 +1,24 @@
|
|||||||
class SetupController < ApplicationController
|
class SetupController < ApplicationController
|
||||||
allow_unauthenticated_access
|
allow_unauthenticated_access
|
||||||
before_action { redirect_to root_path if User.exists? }
|
before_action { redirect_to root_path if User.exists? }
|
||||||
|
rate_limit to: 10, within: 15.minutes, only: :create, with: -> { redirect_to new_setup_path, alert: t("flash.setup.try_again_later") }
|
||||||
layout "public"
|
layout "public"
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@user = User.new
|
@user = User.new
|
||||||
|
SetupCode.announce
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@user = User.new(params.require(:user).permit(:name, :email_address, :password, :password_confirmation))
|
@user = User.new(params.require(:user).permit(:name, :email_address, :password, :password_confirmation))
|
||||||
@user.admin = true
|
@user.admin = true
|
||||||
|
unless SetupCode.matches?(params[:setup_code])
|
||||||
|
@user.errors.add(:base, t("flash.setup.wrong_code"))
|
||||||
|
SetupCode.announce
|
||||||
|
return render(:new, status: :unprocessable_entity)
|
||||||
|
end
|
||||||
if @user.save
|
if @user.save
|
||||||
|
SetupCode.clear
|
||||||
start_new_session_for @user
|
start_new_session_for @user
|
||||||
redirect_to root_path, notice: t("flash.setup.welcome_you_re_the")
|
redirect_to root_path, notice: t("flash.setup.welcome_you_re_the")
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ module AircraftHelper
|
|||||||
|
|
||||||
# What the app saves ahead of time for use without signal (see
|
# What the app saves ahead of time for use without signal (see
|
||||||
# offline_prep_controller.js): for each of your aircraft, the Overview, W&B,
|
# offline_prep_controller.js): for each of your aircraft, the Overview, W&B,
|
||||||
# Log Flight and Report Squawk pages, and its photo.
|
# Log Flight and Report Squawk pages, and its photo (at both page sizes).
|
||||||
def offline_pages
|
def offline_pages
|
||||||
current_user.accessible_aircraft.ordered.limit(OFFLINE_AIRCRAFT).map do |a|
|
current_user.accessible_aircraft.ordered.limit(OFFLINE_AIRCRAFT).map do |a|
|
||||||
{ tail: a.tail_number, pages: [ aircraft_path(a), aircraft_weight_balance_records_path(a) ],
|
{ tail: a.tail_number, pages: [ aircraft_path(a), aircraft_weight_balance_records_path(a) ],
|
||||||
flight: new_aircraft_flight_log_path(a), squawk: new_aircraft_squawk_path(a),
|
flight: new_aircraft_flight_log_path(a), squawk: new_aircraft_squawk_path(a),
|
||||||
picture: (url_for(a.picture) if a.picture.attached?) }.compact
|
pictures: (%i[thumb card].map { url_for(a.picture_for(_1)) }.uniq if a.picture_shown?) }.compact
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
# Tabs on the aircraft pages: [label, path, controller names that highlight it, owner_only]
|
# Tabs on the aircraft pages: [label, path, controller names that highlight it, owner_only]
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ module MarkdownHelper
|
|||||||
extension: { strikethrough: true, tagfilter: true, table: true, autolink: true, tasklist: true, header_ids: nil, footnotes: false }
|
extension: { strikethrough: true, tagfilter: true, table: true, autolink: true, tasklist: true, header_ids: nil, footnotes: false }
|
||||||
}.freeze
|
}.freeze
|
||||||
TAGS = %w[p br strong em del a ul ol li blockquote code pre h1 h2 h3 h4 h5 h6 hr table thead tbody tr th td input span].freeze
|
TAGS = %w[p br strong em del a ul ol li blockquote code pre h1 h2 h3 h4 h5 h6 hr table thead tbody tr th td input span].freeze
|
||||||
ATTRIBUTES = %w[href title type checked disabled align class].freeze
|
ATTRIBUTES = %w[href title type checked disabled align].freeze
|
||||||
|
|
||||||
def markdown(text)
|
def markdown(text)
|
||||||
return "".html_safe if text.blank?
|
return "".html_safe if text.blank?
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export default class extends Controller {
|
|||||||
await new Promise((resolve) => (window.requestIdleCallback || setTimeout)(resolve, { timeout: 2000 }))
|
await new Promise((resolve) => (window.requestIdleCallback || setTimeout)(resolve, { timeout: 2000 }))
|
||||||
try { await fetch(path, { credentials: "same-origin", headers: { Accept: "text/html" } }) } catch (_) { return }
|
try { await fetch(path, { credentials: "same-origin", headers: { Accept: "text/html" } }) } catch (_) { return }
|
||||||
}
|
}
|
||||||
await this.savePictures(this.aircraftValue.map((a) => a.picture).filter(Boolean))
|
await this.savePictures(this.aircraftValue.flatMap((a) => a.pictures || []))
|
||||||
try {
|
try {
|
||||||
localStorage.setItem("sam-offline-forms", JSON.stringify({ ...JSON.parse(localStorage.getItem("sam-offline-forms") || "{}"), ...forms }))
|
localStorage.setItem("sam-offline-forms", JSON.stringify({ ...JSON.parse(localStorage.getItem("sam-offline-forms") || "{}"), ...forms }))
|
||||||
localStorage.setItem("sam-offline-prep", JSON.stringify({ signature, at: Date.now() }))
|
localStorage.setItem("sam-offline-prep", JSON.stringify({ signature, at: Date.now() }))
|
||||||
@@ -58,10 +58,11 @@ export default class extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Photo links carry an expiry, so they change with every page; the saved copy
|
// Photo links carry an expiry, so they change with every page; the saved copy
|
||||||
// is filed under the upload's id instead (same rule in service-worker.js).
|
// is filed under the upload's id (and size) instead (same rule in service-worker.js).
|
||||||
function imageKey(url) {
|
function imageKey(url) {
|
||||||
try {
|
try {
|
||||||
const signed = new URL(url, location.origin).pathname.match(/\/blobs\/redirect\/([^/]+?)--/)[1]
|
const [ , signed, size ] = new URL(url, location.origin).pathname.match(/\/(?:blobs|representations)\/redirect\/([^/]+?)--[^/]+\/(?:([^/]+)\/)?/)
|
||||||
return `${location.origin}/offline-image/${JSON.parse(atob(decodeURIComponent(signed)))._rails.data}`
|
const id = JSON.parse(atob(decodeURIComponent(signed)))._rails.data
|
||||||
|
return `${location.origin}/offline-image/${id}${size ? `/${size}` : ""}`
|
||||||
} catch (_) { return null }
|
} catch (_) { return null }
|
||||||
}
|
}
|
||||||
@@ -14,18 +14,34 @@ export default class extends Controller {
|
|||||||
this.registration = await navigator.serviceWorker.ready
|
this.registration = await navigator.serviceWorker.ready
|
||||||
const subscription = await this.registration.pushManager.getSubscription()
|
const subscription = await this.registration.pushManager.getSubscription()
|
||||||
if (Notification.permission === "denied") return this.show(t("push.blocked"), null)
|
if (Notification.permission === "denied") return this.show(t("push.blocked"), null)
|
||||||
this.show(t(subscription ? "push.on" : "push.off"), !!subscription)
|
if (!subscription) return this.show(t("push.off"), false)
|
||||||
|
// The browser keeps its subscription even if the app never recorded it
|
||||||
|
// (or forgot it), so record it again on every visit.
|
||||||
|
const error = await this.save(subscription)
|
||||||
|
this.show(error ? t("push.not_saved", { reason: error }) : t("push.on"), true)
|
||||||
}
|
}
|
||||||
|
|
||||||
async turnOn() {
|
async turnOn() {
|
||||||
if (await Notification.requestPermission() !== "granted") return this.show(t("push.blocked"), null)
|
if (await Notification.requestPermission() !== "granted") return this.show(t("push.blocked"), null)
|
||||||
|
let subscription
|
||||||
|
try {
|
||||||
|
subscription = await this.registration.pushManager.subscribe({ userVisibleOnly: true, applicationServerKey: this.keyBytes() })
|
||||||
|
} catch (e) {
|
||||||
|
return this.show(t("push.failed", { reason: e.message || e.name }), false)
|
||||||
|
}
|
||||||
|
const error = await this.save(subscription)
|
||||||
|
this.show(error ? t("push.failed", { reason: error }) : t("push.on"), !error)
|
||||||
|
if (error) await subscription.unsubscribe()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Records the subscription with the app: null, or why it couldn't.
|
||||||
|
async save(subscription) {
|
||||||
try {
|
try {
|
||||||
const subscription = await this.registration.pushManager.subscribe({ userVisibleOnly: true, applicationServerKey: this.keyBytes() })
|
|
||||||
const response = await this.request("POST", this.urlValue, { subscription: subscription.toJSON() })
|
const response = await this.request("POST", this.urlValue, { subscription: subscription.toJSON() })
|
||||||
if (!response.ok) throw new Error(response.status)
|
if (response.ok) return null
|
||||||
this.show(t("push.on"), true)
|
return (await response.json().catch(() => ({}))).error || `HTTP ${response.status}`
|
||||||
} catch (_) {
|
} catch (e) {
|
||||||
this.show(t("push.failed"), false)
|
return e.message
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,9 +54,18 @@ export default class extends Controller {
|
|||||||
this.show(t("push.off"), false)
|
this.show(t("push.off"), false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Sends one to each of your devices and lists which push services took it.
|
||||||
async sendTest() {
|
async sendTest() {
|
||||||
await this.request("POST", this.testUrlValue, {})
|
this.statusTarget.textContent = t("push.test_sending")
|
||||||
this.statusTarget.textContent = t("push.test_sent")
|
try {
|
||||||
|
const { devices } = await (await this.request("POST", this.testUrlValue, {})).json()
|
||||||
|
const lines = devices.length
|
||||||
|
? [ ...devices.map((d) => d.error ? t("push.test_failed", { device: d.device, reason: d.error }) : t("push.test_ok", { device: d.device })), t("push.test_hint") ]
|
||||||
|
: [ t("push.test_none") ]
|
||||||
|
this.statusTarget.textContent = lines.join("\n")
|
||||||
|
} catch (e) {
|
||||||
|
this.statusTarget.textContent = t("push.failed", { reason: e.message })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// on: true / false, or null when it can't be changed here.
|
// on: true / false, or null when it can't be changed here.
|
||||||
|
|||||||
@@ -4,20 +4,32 @@ class PushNotificationJob < ApplicationJob
|
|||||||
queue_as :default
|
queue_as :default
|
||||||
|
|
||||||
def perform(user_ids, key, path, tag, vars)
|
def perform(user_ids, key, path, tag, vars)
|
||||||
vars = vars.symbolize_keys
|
message = self.class.message(key, path, tag, vars)
|
||||||
message = JSON.generate(title: I18n.t("push.#{key}.title", **vars), body: I18n.t("push.#{key}.body", **vars), path: path, tag: tag)
|
PushSubscription.where(user_id: user_ids).find_each { self.class.deliver(_1, message) }
|
||||||
PushSubscription.where(user_id: user_ids).find_each { deliver(_1, message) }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
def self.message(key, path, tag, vars = {})
|
||||||
|
vars = vars.symbolize_keys
|
||||||
|
JSON.generate(title: I18n.t("push.#{key}.title", **vars), body: I18n.t("push.#{key}.body", **vars), path: path, tag: tag)
|
||||||
|
end
|
||||||
|
|
||||||
def deliver(subscription, message)
|
# Sends to one device: nil when the push service took it, else why not.
|
||||||
|
def self.deliver(subscription, message)
|
||||||
WebPush.payload_send(message: message, endpoint: subscription.endpoint, p256dh: subscription.p256dh, auth: subscription.auth,
|
WebPush.payload_send(message: message, endpoint: subscription.endpoint, p256dh: subscription.p256dh, auth: subscription.auth,
|
||||||
ttl: 1.day.to_i, urgency: "high",
|
ttl: 1.day.to_i, urgency: "high",
|
||||||
vapid: { subject: PushKeys.subject, public_key: PushKeys.public_key, private_key: PushKeys.private_key })
|
vapid: { subject: PushKeys.subject, public_key: PushKeys.public_key, private_key: PushKeys.private_key })
|
||||||
rescue WebPush::ExpiredSubscription, WebPush::InvalidSubscription, WebPush::Unauthorized
|
nil
|
||||||
|
rescue WebPush::ExpiredSubscription, WebPush::InvalidSubscription, WebPush::Unauthorized => e
|
||||||
subscription.destroy
|
subscription.destroy
|
||||||
|
failure(subscription, e)
|
||||||
rescue WebPush::Error, SocketError, SystemCallError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError => e
|
rescue WebPush::Error, SocketError, SystemCallError, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError => e
|
||||||
Rails.logger.warn("[push] #{subscription.endpoint.truncate(60)}: #{e.class}: #{e.message.truncate(200)}")
|
failure(subscription, e)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.failure(subscription, error)
|
||||||
|
reason = "#{error.class.name.demodulize}: #{error.message.truncate(200)}"
|
||||||
|
Rails.logger.warn("[push] #{subscription.endpoint.truncate(60)}: #{reason}")
|
||||||
|
reason
|
||||||
|
end
|
||||||
|
private_class_method :failure
|
||||||
end
|
end
|
||||||
@@ -20,7 +20,7 @@ class AirTrailConnection < ApplicationRecord
|
|||||||
|
|
||||||
scope :active, -> { where(enabled: true) }
|
scope :active, -> { where(enabled: true) }
|
||||||
|
|
||||||
def client = AirTrailClient.new(base_url: base_url, api_key: api_key)
|
def client = AirTrailClient.new(base_url: base_url, api_key: api_key, allow_private: user&.admin?)
|
||||||
|
|
||||||
def ok? = status == "ok"
|
def ok? = status == "ok"
|
||||||
|
|
||||||
|
|||||||
+18
-2
@@ -1,7 +1,12 @@
|
|||||||
class Aircraft < ApplicationRecord
|
class Aircraft < ApplicationRecord
|
||||||
STATUSES = LabelSet.new("aircraft.statuses", %w[AVAILABLE MX GROUND UNAVAILABLE])
|
STATUSES = LabelSet.new("aircraft.statuses", %w[AVAILABLE MX GROUND UNAVAILABLE])
|
||||||
|
|
||||||
has_one_attached :picture
|
# Small copies of the photo for the pages (the original can be several MB):
|
||||||
|
# made when it's uploaded; see #picture_for.
|
||||||
|
has_one_attached :picture do |picture|
|
||||||
|
picture.variant :thumb, resize_to_fill: [ 192, 192 ], preprocessed: true
|
||||||
|
picture.variant :card, resize_to_fill: [ 960, 432 ], preprocessed: true
|
||||||
|
end
|
||||||
|
|
||||||
has_many :roles, class_name: "AircraftRole", dependent: :destroy
|
has_many :roles, class_name: "AircraftRole", dependent: :destroy
|
||||||
has_many :users, through: :roles
|
has_many :users, through: :roles
|
||||||
@@ -77,10 +82,21 @@ class Aircraft < ApplicationRecord
|
|||||||
events.create!(category: category, event_name: event_name, user: user, notes: notes)
|
events.create!(category: category, event_name: event_name, user: user, notes: notes)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# A saved photo to show (not one just rejected by validation, which has no
|
||||||
|
# address yet).
|
||||||
|
def picture_shown? = picture.attached? && picture.attachment.persisted?
|
||||||
|
|
||||||
|
# The photo at a page's size (:thumb or :card), or the original when it
|
||||||
|
# isn't a kind that can be resized. (One that can't be read is sent as the
|
||||||
|
# original too: see config/initializers/active_storage_images.rb.)
|
||||||
|
def picture_for(size)
|
||||||
|
picture.variable? ? picture.variant(size) : picture
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def picture_is_image
|
def picture_is_image
|
||||||
if picture.attached? && !picture.content_type.to_s.start_with?("image/")
|
if picture.attached? && (!picture.content_type.to_s.start_with?("image/") || picture.blob.byte_size.zero?)
|
||||||
errors.add(:picture, :not_image)
|
errors.add(:picture, :not_image)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,3 +1,28 @@
|
|||||||
class ApplicationRecord < ActiveRecord::Base
|
class ApplicationRecord < ActiveRecord::Base
|
||||||
primary_abstract_class
|
primary_abstract_class
|
||||||
|
|
||||||
|
before_validation :default_blank_required_columns
|
||||||
|
validate :optional_references_exist
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
# A blank form field arrives as nil; for a column that can't be empty and has
|
||||||
|
# a default (a checkbox, a count, a position), use the default rather than
|
||||||
|
# failing in the database.
|
||||||
|
def default_blank_required_columns
|
||||||
|
self.class.columns.each do |column|
|
||||||
|
next if column.null || column.default.nil? || !self[column.name].nil?
|
||||||
|
self[column.name] = self.class.type_for_attribute(column.name).cast(column.default)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# An optional link (a parent part, a collection…) given an id that doesn't
|
||||||
|
# exist is a mistake in the form, not something to store.
|
||||||
|
def optional_references_exist
|
||||||
|
self.class.reflect_on_all_associations(:belongs_to).each do |assoc|
|
||||||
|
next if assoc.polymorphic? || !assoc.options[:optional]
|
||||||
|
next if self[assoc.foreign_key].blank? || !attribute_changed?(assoc.foreign_key)
|
||||||
|
errors.add(assoc.name, :invalid) unless public_send(assoc.name)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
+15
-4
@@ -44,13 +44,23 @@ class Component < ApplicationRecord
|
|||||||
OVERHAUL_ABBREVIATIONS.fetch(overhaul_kind) { engine? || propeller? ? "TSO" : I18n.t("models.component.since_service") }
|
OVERHAUL_ABBREVIATIONS.fetch(overhaul_kind) { engine? || propeller? ? "TSO" : I18n.t("models.component.since_service") }
|
||||||
end
|
end
|
||||||
|
|
||||||
# Its sub-components, and theirs.
|
# Its sub-components, and theirs. (Stops at a loop, should one exist.)
|
||||||
def descendant_ids
|
def descendant_ids(seen = Set[id])
|
||||||
child_components.flat_map { [ _1.id, *_1.descendant_ids ] }
|
child_components.flat_map do |child|
|
||||||
|
next [] unless seen.add?(child.id)
|
||||||
|
[ child.id, *child.descendant_ids(seen) ]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Its parent, the parent's parent, and so on up.
|
||||||
def ancestor_ids
|
def ancestor_ids
|
||||||
parent_component ? [ parent_component_id, *parent_component.ancestor_ids ] : []
|
ids = []
|
||||||
|
node = self
|
||||||
|
while (parent_id = node.parent_component_id) && parent_id != id && !ids.include?(parent_id)
|
||||||
|
ids << parent_id
|
||||||
|
node = Component.find_by(id: parent_id) or break
|
||||||
|
end
|
||||||
|
ids
|
||||||
end
|
end
|
||||||
def engine? = component_type&.name.to_s.match?(/engine/i)
|
def engine? = component_type&.name.to_s.match?(/engine/i)
|
||||||
def propeller? = component_type&.name.to_s.match?(/propell?er|\bprop\b/i)
|
def propeller? = component_type&.name.to_s.match?(/propell?er|\bprop\b/i)
|
||||||
@@ -133,6 +143,7 @@ class Component < ApplicationRecord
|
|||||||
def parent_on_same_aircraft
|
def parent_on_same_aircraft
|
||||||
return unless parent_component
|
return unless parent_component
|
||||||
errors.add(:parent_component, :itself) if parent_component_id == id && id
|
errors.add(:parent_component, :itself) if parent_component_id == id && id
|
||||||
|
errors.add(:parent_component, :own_part) if id && parent_component.ancestor_ids.include?(id) # would make a loop
|
||||||
errors.add(:parent_component, :other_aircraft) if parent_component.aircraft_id != aircraft_id
|
errors.add(:parent_component, :other_aircraft) if parent_component.aircraft_id != aircraft_id
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
class PushSubscription < ApplicationRecord
|
class PushSubscription < ApplicationRecord
|
||||||
# The browsers' push services. The server posts to the endpoint, so only
|
# The browsers' push services. The server posts to the endpoint, so only
|
||||||
# these hosts are accepted (not, say, an address inside the network).
|
# these hosts are accepted (not, say, an address inside the network).
|
||||||
PUSH_SERVICES = /\A(fcm\.googleapis\.com|updates\.push\.services\.mozilla\.com|([\w-]+\.)*push\.apple\.com|([\w-]+\.)*notify\.windows\.com)\z/
|
PUSH_SERVICES = /\A(([\w-]+\.)*googleapis\.com|([\w-]+\.)*google\.com|updates\.push\.services\.mozilla\.com|([\w-]+\.)*push\.apple\.com|([\w-]+\.)*notify\.windows\.com)\z/
|
||||||
|
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# The application secret key signs the sign-in cookie and protects stored
|
||||||
|
# secrets (two-factor keys, API keys), so anyone who can guess it can sign in
|
||||||
|
# as anyone. A placeholder or short key stops the app from starting; one
|
||||||
|
# shorter than what `bin/rails secret` makes is reported by sam:doctor.
|
||||||
|
module SecretKeyCheck
|
||||||
|
MIN = 32 # below this, refuse to start
|
||||||
|
RECOMMENDED = 64 # below this, warn
|
||||||
|
PLACEHOLDERS = %w[change-me changeme change_me secret password your-secret-key replace-me example].freeze
|
||||||
|
|
||||||
|
module_function
|
||||||
|
|
||||||
|
# :ok, :weak or :unsafe
|
||||||
|
def strength(key = ENV["SECRET_KEY_BASE"].to_s)
|
||||||
|
return :unsafe if PLACEHOLDERS.include?(key.strip.downcase) || key.length < MIN || key.chars.uniq.size < 10
|
||||||
|
key.length < RECOMMENDED ? :weak : :ok
|
||||||
|
end
|
||||||
|
|
||||||
|
def verify!(key = ENV["SECRET_KEY_BASE"].to_s)
|
||||||
|
case strength(key)
|
||||||
|
when :unsafe
|
||||||
|
abort "SECRET_KEY_BASE is a placeholder or too short (#{key.length} characters). " \
|
||||||
|
"Set it to the output of `bin/rails secret` (128 random characters) and start again."
|
||||||
|
when :weak
|
||||||
|
Rails.logger.warn("[security] SECRET_KEY_BASE is only #{key.length} characters; `bin/rails secret` makes 128.")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Until the first account exists, whoever reaches the server could create the
|
||||||
|
# admin account. The setup page asks for this one-time code, which is only in
|
||||||
|
# the server's log, so only whoever runs the server can finish setup.
|
||||||
|
module SetupCode
|
||||||
|
ALPHABET = "ABCDEFGHJKMNPQRSTUVWXYZ23456789".chars.freeze # no look-alikes (0/O, 1/I/L)
|
||||||
|
|
||||||
|
module_function
|
||||||
|
|
||||||
|
# (Each parallel test process has its own.)
|
||||||
|
def file = Rails.env.test? ? Rails.root.join("tmp", "setup_code-#{Process.pid}") : Rails.root.join("storage", "setup_code")
|
||||||
|
|
||||||
|
# The code, made the first time it's needed and kept until setup is done.
|
||||||
|
def current
|
||||||
|
return file.read.strip if file.exist?
|
||||||
|
code = Array.new(8) { ALPHABET[SecureRandom.random_number(ALPHABET.size)] }.join.insert(4, "-")
|
||||||
|
file.dirname.mkpath
|
||||||
|
File.write(file, code, perm: 0o600)
|
||||||
|
code
|
||||||
|
end
|
||||||
|
|
||||||
|
def announce
|
||||||
|
Rails.logger.warn("Setup code: #{current} (enter it on the setup page to create the admin account)")
|
||||||
|
end
|
||||||
|
|
||||||
|
def matches?(given)
|
||||||
|
normalize = ->(s) { s.to_s.upcase.gsub(/[^A-Z0-9]/, "") }
|
||||||
|
ActiveSupport::SecurityUtils.secure_compare(normalize.(given), normalize.(current))
|
||||||
|
end
|
||||||
|
|
||||||
|
def clear
|
||||||
|
file.delete if file.exist?
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -16,12 +16,25 @@ class AirTrailClient
|
|||||||
class NotFound < Error; end
|
class NotFound < Error; end
|
||||||
class ValidationError < Error; end # 400/422
|
class ValidationError < Error; end # 400/422
|
||||||
|
|
||||||
def initialize(base_url:, api_key:, timeout: 20)
|
# An address the server won't send to (see #address). Like a bad key, the
|
||||||
|
# user has to fix the connection, so it's recorded there and not retried.
|
||||||
|
class BlockedAddress < AuthError; end
|
||||||
|
|
||||||
|
# allow_private: may reach addresses on the private network (admins; and
|
||||||
|
# hosts listed in AIRTRAIL_ALLOWED_HOSTS for everyone). The server itself
|
||||||
|
# and link-local addresses (cloud metadata) are never reached.
|
||||||
|
def initialize(base_url:, api_key:, timeout: 20, allow_private: false)
|
||||||
@base = URI.parse(base_url.to_s.chomp("/"))
|
@base = URI.parse(base_url.to_s.chomp("/"))
|
||||||
@api_key = api_key
|
@api_key = api_key
|
||||||
@timeout = timeout
|
@timeout = timeout
|
||||||
|
@allow_private = allow_private || self.class.allowed_hosts.include?(@base.host.to_s.downcase)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Host name → IP addresses (replaceable in tests, which have no DNS).
|
||||||
|
class_attribute :resolver, default: ->(host) { Addrinfo.getaddrinfo(host, nil, nil, :STREAM).map(&:ip_address) }
|
||||||
|
|
||||||
|
def self.allowed_hosts = ENV.fetch("AIRTRAIL_ALLOWED_HOSTS", "").split(",").map { _1.strip.downcase }.compact_blank
|
||||||
|
|
||||||
def me = request(:get, "/api/v1/me").fetch("data")
|
def me = request(:get, "/api/v1/me").fetch("data")
|
||||||
|
|
||||||
def search_airports(query) = request(:get, "/api/v1/airports", query: { query: query }).fetch("data")
|
def search_airports(query) = request(:get, "/api/v1/airports", query: { query: query }).fetch("data")
|
||||||
@@ -63,13 +76,33 @@ class AirTrailClient
|
|||||||
req.body = JSON.generate(body)
|
req.body = JSON.generate(body)
|
||||||
end
|
end
|
||||||
|
|
||||||
response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https",
|
http = Net::HTTP.new(uri.host, uri.port)
|
||||||
open_timeout: @timeout, read_timeout: @timeout) { _1.request(req) }
|
http.ipaddr = address(uri.host) # connect to the address that was checked (the name can't be re-pointed in between)
|
||||||
handle(response)
|
http.use_ssl = uri.scheme == "https"
|
||||||
|
http.open_timeout = http.read_timeout = @timeout
|
||||||
|
handle(http.start { _1.request(req) })
|
||||||
rescue Timeout::Error, SocketError, SystemCallError, OpenSSL::SSL::SSLError, EOFError, IOError => e
|
rescue Timeout::Error, SocketError, SystemCallError, OpenSSL::SSL::SSLError, EOFError, IOError => e
|
||||||
raise NetworkError, I18n.t("services.air_trail.can_t_reach_airtrail_at", host: @base.host, message: e.message)
|
raise NetworkError, I18n.t("services.air_trail.can_t_reach_airtrail_at", host: @base.host, message: e.message)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# The address to connect to: the host's first, once all of its addresses are
|
||||||
|
# ones this connection may reach.
|
||||||
|
def address(host)
|
||||||
|
ips = resolver.call(host).map { IPAddr.new(_1.sub(/%.*/, "")) }.uniq
|
||||||
|
raise SocketError, "no address" if ips.empty?
|
||||||
|
ips.each do |ip|
|
||||||
|
ip = ip.native # ::ffff:10.0.0.1 → 10.0.0.1
|
||||||
|
reason = if ip.loopback? || ip.link_local? || UNREACHABLE.any? { _1.include?(ip) } then :never
|
||||||
|
elsif (ip.private? || CGNAT.include?(ip)) && !@allow_private then :private
|
||||||
|
end
|
||||||
|
raise BlockedAddress, I18n.t("services.air_trail.blocked_#{reason}", host: host) if reason
|
||||||
|
end
|
||||||
|
ips.first.to_s
|
||||||
|
end
|
||||||
|
|
||||||
|
UNREACHABLE = [ IPAddr.new("0.0.0.0/8"), IPAddr.new("::/128"), IPAddr.new("224.0.0.0/4"), IPAddr.new("ff00::/8") ].freeze
|
||||||
|
CGNAT = IPAddr.new("100.64.0.0/10") # shared address space, e.g. Tailscale
|
||||||
|
|
||||||
def handle(response)
|
def handle(response)
|
||||||
status = response.code.to_i
|
status = response.code.to_i
|
||||||
json = begin
|
json = begin
|
||||||
|
|||||||
@@ -28,7 +28,12 @@ class SystemDoctor
|
|||||||
|
|
||||||
def secret_key
|
def secret_key
|
||||||
return ok("Secret key", "development/test key") unless production?
|
return ok("Secret key", "development/test key") unless production?
|
||||||
ENV["SECRET_KEY_BASE"].present? || ENV["RAILS_MASTER_KEY"].present? ? ok("Secret key", "set (keep a copy off the server)") : warning("Secret key", "SECRET_KEY_BASE isn't set in the environment")
|
return warning("Secret key", "SECRET_KEY_BASE isn't set in the environment") if ENV["SECRET_KEY_BASE"].blank? && ENV["RAILS_MASTER_KEY"].blank?
|
||||||
|
return ok("Secret key", "set (keep a copy off the server)") if ENV["SECRET_KEY_BASE"].blank?
|
||||||
|
case SecretKeyCheck.strength
|
||||||
|
when :ok then ok("Secret key", "set (keep a copy off the server)")
|
||||||
|
else failed("Secret key", "only #{ENV['SECRET_KEY_BASE'].length} characters: replace it with the output of bin/rails secret")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def host
|
def host
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
<% aw = aircraft.airworthiness %>
|
<% aw = aircraft.airworthiness %>
|
||||||
<%= link_to aircraft_path(aircraft), class: "card block overflow-hidden transition hover:shadow-md" do %>
|
<%= link_to aircraft_path(aircraft), class: "card block overflow-hidden transition hover:shadow-md" do %>
|
||||||
<div class="flex h-36 items-center justify-center bg-slate-200">
|
<div class="flex h-36 items-center justify-center bg-slate-200">
|
||||||
<% if aircraft.picture.attached? %>
|
<% if aircraft.picture_shown? %>
|
||||||
<%= image_tag aircraft.picture, class: "h-full w-full object-cover", alt: t(".photo_of", tail_number: aircraft.tail_number) %>
|
<%= image_tag aircraft.picture_for(:card), class: "h-full w-full object-cover", loading: "lazy", alt: t(".photo_of", tail_number: aircraft.tail_number) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="text-5xl text-slate-400" aria-hidden="true">✈</span>
|
<span class="text-5xl text-slate-400" aria-hidden="true">✈</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -11,28 +11,28 @@
|
|||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<dl class="card-body grid grid-cols-2 gap-x-4 gap-y-2 text-sm sm:grid-cols-4">
|
<dl class="card-body grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2">
|
||||||
<dt class="text-slate-500"><%= t(".manufacturer") %></dt><dd><%= @component.manufacturer %></dd>
|
<div class="detail-row"><dt><%= t(".manufacturer") %></dt><dd><%= @component.manufacturer %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".model") %></dt><dd><%= @component.model %></dd>
|
<div class="detail-row"><dt><%= t(".model") %></dt><dd><%= @component.model %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".serial") %></dt><dd><%= @component.serial_number.presence || "—" %></dd>
|
<div class="detail-row"><dt><%= t(".serial") %></dt><dd><%= @component.serial_number.presence || "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".status") %></dt><dd><%= @component.status_label %></dd>
|
<div class="detail-row"><dt><%= t(".status") %></dt><dd><%= @component.status_label %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".parent") %></dt><dd><%= @component.parent_component ? link_to(@component.parent_component, aircraft_component_path(@aircraft, @component.parent_component), class: "link") : "—" %></dd>
|
<div class="detail-row"><dt><%= t(".parent") %></dt><dd><%= @component.parent_component ? link_to(@component.parent_component, aircraft_component_path(@aircraft, @component.parent_component), class: "link") : "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".location") %></dt><dd><%= @component.install_location.presence || "—" %></dd>
|
<div class="detail-row"><dt><%= t(".location") %></dt><dd><%= @component.install_location.presence || "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".in_service_since") %></dt><dd><%= fmt_date(@component.date_in_service) %></dd>
|
<div class="detail-row"><dt><%= t(".in_service_since") %></dt><dd><%= fmt_date(@component.date_in_service) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".last_oh_service") %></dt><dd><%= fmt_date(@component.overhaul_date) %></dd>
|
<div class="detail-row"><dt><%= t(".last_oh_service") %></dt><dd><%= fmt_date(@component.overhaul_date) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".hours_in_service") %></dt><dd><%= hours(@component.hours_in_service) %></dd>
|
<div class="detail-row"><dt><%= t(".hours_in_service") %></dt><dd><%= hours(@component.hours_in_service) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".since_oh_service") %></dt><dd><%= hours(@component.hours_since_overhaul) %></dd>
|
<div class="detail-row"><dt><%= t(".since_oh_service") %></dt><dd><%= hours(@component.hours_since_overhaul) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".tbo") %></dt><dd><%= @component.tbo_hours ? t(".h_remaining", tbo_hours: @component.tbo_hours, hours_to_tbo: (hours(@component.hours_to_tbo))) : "—" %></dd>
|
<div class="detail-row"><dt><%= t(".tbo") %></dt><dd><%= @component.tbo_hours ? t(".h_remaining", tbo_hours: @component.tbo_hours, hours_to_tbo: (hours(@component.hours_to_tbo))) : "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".replacement") %></dt><dd>
|
<div class="detail-row"><dt><%= t(".replacement") %></dt><dd>
|
||||||
<%= [@component.replacement_hours && "#{@component.replacement_hours} h", @component.replacement_interval_label].compact.join(" / ").presence&.then { @component.replacement_from_install? ? t(".since_installed", interval: _1) : _1 } || "—" %>
|
<%= [@component.replacement_hours && "#{@component.replacement_hours} h", @component.replacement_interval_label].compact.join(" / ").presence&.then { @component.replacement_from_install? ? t(".since_installed", interval: _1) : _1 } || "—" %>
|
||||||
<% if (d = @component.next_replacement_date) %><div class="text-xs text-slate-500"><%= t(".next_by_html", d: (fmt_date(d))) %></div><% end %>
|
<% if (d = @component.next_replacement_date) %><div class="text-xs text-slate-500"><%= t(".next_by_html", d: (fmt_date(d))) %></div><% end %>
|
||||||
</dd>
|
</dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".flags") %></dt>
|
<div class="detail-row sm:col-span-2"><dt><%= t(".flags") %></dt>
|
||||||
<dd class="col-span-3 flex flex-wrap gap-1">
|
<dd class="flex flex-wrap gap-1">
|
||||||
<% { tbo_critical: t(".tbo_critical"), replacement_critical: t(".replacement_critical"), on_condition: t(".on_condition") }.each do |flag, label| %>
|
<% { tbo_critical: t(".tbo_critical"), replacement_critical: t(".replacement_critical"), on_condition: t(".on_condition") }.each do |flag, label| %>
|
||||||
<% if @component.public_send("#{flag}?") %><span class="badge-blue"><%= label %></span><% end %>
|
<% if @component.public_send("#{flag}?") %><span class="badge-blue"><%= label %></span><% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</dd>
|
</dd></div>
|
||||||
</dl>
|
</dl>
|
||||||
<% if @component.notes.present? %><div class="border-t border-slate-100 px-4 py-3 text-sm"><%= simple_format @component.notes %></div><% end %>
|
<% if @component.notes.present? %><div class="border-t border-slate-100 px-4 py-3 text-sm"><%= simple_format @component.notes %></div><% end %>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -17,15 +17,15 @@
|
|||||||
<% if tail.present? && tail.upcase != @aircraft.tail_number.to_s.upcase %>
|
<% if tail.present? && tail.upcase != @aircraft.tail_number.to_s.upcase %>
|
||||||
<p class="border-b border-slate-100 bg-amber-50 px-4 py-2 text-xs text-amber-800"><%= t(".this_recording_is_from_not_html", tail: tail, tail_number: @aircraft.tail_number) %></p>
|
<p class="border-b border-slate-100 bg-amber-50 px-4 py-2 text-xs text-amber-800"><%= t(".this_recording_is_from_not_html", tail: tail, tail_number: @aircraft.tail_number) %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
<dl class="card-body grid grid-cols-2 gap-x-4 gap-y-2 text-sm sm:grid-cols-4">
|
<dl class="card-body grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2">
|
||||||
<dt class="text-slate-500"><%= t(".recorded") %></dt>
|
<div class="detail-row sm:col-span-2"><dt><%= t(".recorded") %></dt>
|
||||||
<dd class="col-span-3"><%= t(".monitor_time_html", start: (recording.local(recording.started_at).strftime("%Y-%m-%d %H:%M")), end: (recording.local(recording.ended_at).strftime("%H:%M"))) %>
|
<dd><%= t(".monitor_time_html", start: (recording.local(recording.started_at).strftime("%Y-%m-%d %H:%M")), end: (recording.local(recording.ended_at).strftime("%H:%M"))) %>
|
||||||
<span class="text-xs text-slate-500"><%= t(".samples_html", file_format: recording.format, flight_number: (" flight ##{recording.metadata[:flight_number]}" if recording.metadata[:flight_number]), samples: (number_with_delimiter(recording.samples))) %></span></dd>
|
<span class="text-xs text-slate-500"><%= t(".samples_html", file_format: recording.format, flight_number: (" flight ##{recording.metadata[:flight_number]}" if recording.metadata[:flight_number]), samples: (number_with_delimiter(recording.samples))) %></span></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".engine_run") %></dt><dd><%= recording.engine_start ? run_duration(recording.run_time) : t(".engine_not_run") %></dd>
|
<div class="detail-row"><dt><%= t(".engine_run") %></dt><dd><%= recording.engine_start ? run_duration(recording.run_time) : t(".engine_not_run") %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".fuel_burned") %></dt><dd><%= engine_value(recording.fuel_burned, "gal", precision: 1) %></dd>
|
<div class="detail-row"><dt><%= t(".fuel_burned") %></dt><dd><%= engine_value(recording.fuel_burned, "gal", precision: 1) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".tach") %></dt><dd class="tabular-nums"><%= hours_line.(:tach, 2) %></dd>
|
<div class="detail-row"><dt><%= t(".tach") %></dt><dd class="tabular-nums"><%= hours_line.(:tach, 2) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".engine_hrs") %></dt><dd class="tabular-nums"><%= hours_line.(:engine_hours, 2) %></dd>
|
<div class="detail-row"><dt><%= t(".engine_hrs") %></dt><dd class="tabular-nums"><%= hours_line.(:engine_hours, 2) %></dd></div>
|
||||||
<% if (flt = recording.last(:flight_hours)) %><dt class="text-slate-500"><%= t(".airborne") %></dt><dd><%= flt.zero? ? t(".no_ground_run") : "#{number_with_precision(flt, precision: 2)} hrs" %></dd><% end %>
|
<% if (flt = recording.last(:flight_hours)) %><div class="detail-row"><dt><%= t(".airborne") %></dt><dd><%= flt.zero? ? t(".no_ground_run") : "#{number_with_precision(flt, precision: 2)} hrs" %></dd></div><% end %>
|
||||||
</dl>
|
</dl>
|
||||||
|
|
||||||
<div class="overflow-x-auto border-t border-slate-100">
|
<div class="overflow-x-auto border-t border-slate-100">
|
||||||
|
|||||||
@@ -3,23 +3,24 @@
|
|||||||
<section class="card max-w-3xl">
|
<section class="card max-w-3xl">
|
||||||
<div class="card-header"><h2 class="card-title"><%= t(".flight_on_html", date: (fmt_date(@flight_log.date))) %></h2>
|
<div class="card-header"><h2 class="card-title"><%= t(".flight_on_html", date: (fmt_date(@flight_log.date))) %></h2>
|
||||||
<% if owner? %><%= delete_button t(".delete"), aircraft_flight_log_path(@aircraft, @flight_log), confirm: t(".delete_this_flight_log_aircraft") %><% end %></div>
|
<% if owner? %><%= delete_button t(".delete"), aircraft_flight_log_path(@aircraft, @flight_log), confirm: t(".delete_this_flight_log_aircraft") %><% end %></div>
|
||||||
<dl class="card-body grid grid-cols-2 gap-x-4 gap-y-2 text-sm sm:grid-cols-4">
|
<%# One item per row on a phone (label, then value); two columns on wider screens. %>
|
||||||
<dt class="text-slate-500"><%= t(".tach") %></dt><dd><%= hours(@flight_log.tach_time) %> <span class="text-xs text-slate-500"><%= "(#{@flight_log.tach_out} → #{@flight_log.tach_in})" if @flight_log.tach_out && @flight_log.tach_in %></span></dd>
|
<dl class="card-body grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2">
|
||||||
<dt class="text-slate-500"><%= t(".hobbs") %></dt><dd><%= hours(@flight_log.hobbs_time) %> <span class="text-xs text-slate-500"><%= "(#{@flight_log.hobbs_out} → #{@flight_log.hobbs_in})" if @flight_log.hobbs_out && @flight_log.hobbs_in %></span></dd>
|
<div class="detail-row"><dt><%= t(".tach") %></dt><dd><%= hours(@flight_log.tach_time) %> <span class="text-xs text-slate-500"><%= "(#{@flight_log.tach_out} → #{@flight_log.tach_in})" if @flight_log.tach_out && @flight_log.tach_in %></span></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".route") %></dt><dd class="col-span-3"><%= @flight_log.route_summary.presence || "—" %> <%= @flight_log.route %></dd>
|
<div class="detail-row"><dt><%= t(".hobbs") %></dt><dd><%= hours(@flight_log.hobbs_time) %> <span class="text-xs text-slate-500"><%= "(#{@flight_log.hobbs_out} → #{@flight_log.hobbs_in})" if @flight_log.hobbs_out && @flight_log.hobbs_in %></span></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".oil_added") %></dt><dd><%= @flight_log.oil_added ? "#{@flight_log.oil_added} qt #{@flight_log.oil_added_type}" : "—" %></dd>
|
<div class="detail-row sm:col-span-2"><dt><%= t(".route") %></dt><dd><%= @flight_log.route_summary.presence || "—" %> <%= @flight_log.route %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".fuel_added") %></dt><dd><%= @flight_log.fuel_added ? "#{@flight_log.fuel_added} gal #{@flight_log.fuel_added_type}" : "—" %></dd>
|
<div class="detail-row"><dt><%= t(".oil_added") %></dt><dd><%= @flight_log.oil_added ? "#{@flight_log.oil_added} qt #{@flight_log.oil_added_type}" : "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".pilot") %></dt><dd><%= @flight_log.user&.display_name || "—" %></dd>
|
<div class="detail-row"><dt><%= t(".fuel_added") %></dt><dd><%= @flight_log.fuel_added ? "#{@flight_log.fuel_added} gal #{@flight_log.fuel_added_type}" : "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".track_log") %></dt><dd class="col-span-3"><%= @flight_log.track_log.attached? ? link_to(@flight_log.track_log.filename, rails_blob_path(@flight_log.track_log, disposition: :attachment), class: "link") : "—" %>
|
<div class="detail-row"><dt><%= t(".pilot") %></dt><dd><%= @flight_log.user&.display_name || "—" %></dd></div>
|
||||||
|
<div class="detail-row sm:col-span-2"><dt><%= t(".track_log") %></dt><dd class="min-w-0 break-words"><%= @flight_log.track_log.attached? ? link_to(@flight_log.track_log.filename, rails_blob_path(@flight_log.track_log, disposition: :attachment), class: "link") : "—" %>
|
||||||
<% if @track %><span class="text-xs text-slate-500"> <%= t(".gps_points_html", points: (number_with_delimiter(@track.points)), max_altitude_ft: (t(".max_ft", max_altitude_ft: (number_with_delimiter(@track.max_altitude_ft))) if @track.max_altitude_ft)) %></span>
|
<% if @track %><span class="text-xs text-slate-500"> <%= t(".gps_points_html", points: (number_with_delimiter(@track.points)), max_altitude_ft: (t(".max_ft", max_altitude_ft: (number_with_delimiter(@track.max_altitude_ft))) if @track.max_altitude_ft)) %></span>
|
||||||
<% elsif @track_error %><span class="text-xs text-amber-700"> · <%= @track_error %></span><% end %></dd>
|
<% elsif @track_error %><span class="text-xs text-amber-700"> · <%= @track_error %></span><% end %></dd></div>
|
||||||
<% if @air_trail_sync || @air_trail_connection %>
|
<% if @air_trail_sync || @air_trail_connection %>
|
||||||
<dt class="text-slate-500"><%= t(".airtrail") %></dt>
|
<div class="detail-row sm:col-span-2"><dt><%= t(".airtrail") %></dt>
|
||||||
<dd class="col-span-3 text-xs">
|
<dd class="text-xs">
|
||||||
<% if @air_trail_sync&.status == "synced" %><span class="badge-green"><%= t(".synced") %></span> <%= t(".ago_html", synced_at: (time_ago_in_words(@air_trail_sync.synced_at))) %>
|
<% if @air_trail_sync&.status == "synced" %><span class="badge-green"><%= t(".synced") %></span> <%= t(".ago_html", synced_at: (time_ago_in_words(@air_trail_sync.synced_at))) %>
|
||||||
<% elsif @air_trail_sync&.status == "error" %><span class="badge-red"><%= t(".not_synced") %></span> <%= @air_trail_sync.last_error %>
|
<% elsif @air_trail_sync&.status == "error" %><span class="badge-red"><%= t(".not_synced") %></span> <%= @air_trail_sync.last_error %>
|
||||||
<% else %><span class="badge-gray"><%= t(".pending") %></span><% end %>
|
<% else %><span class="badge-gray"><%= t(".pending") %></span><% end %>
|
||||||
</dd>
|
</dd></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</dl>
|
</dl>
|
||||||
<% if @flight_log.notes.present? %><div class="border-t border-slate-100 px-4 py-3 text-sm"><%= simple_format @flight_log.notes %></div><% end %>
|
<% if @flight_log.notes.present? %><div class="border-t border-slate-100 px-4 py-3 text-sm"><%= simple_format @flight_log.notes %></div><% end %>
|
||||||
|
|||||||
@@ -2,24 +2,24 @@
|
|||||||
<section class="card max-w-4xl">
|
<section class="card max-w-4xl">
|
||||||
<div class="card-header"><h2 class="card-title"><%= @record.type_label %>: <%= @record.title %></h2>
|
<div class="card-header"><h2 class="card-title"><%= @record.type_label %>: <%= @record.title %></h2>
|
||||||
<% if owner? %><%= link_to t(".edit"), edit_aircraft_major_record_path(@aircraft, @record), class: "btn-secondary btn-sm" %><% end %></div>
|
<% if owner? %><%= link_to t(".edit"), edit_aircraft_major_record_path(@aircraft, @record), class: "btn-secondary btn-sm" %><% end %></div>
|
||||||
<dl class="card-body grid grid-cols-2 gap-x-4 gap-y-2 text-sm sm:grid-cols-4">
|
<dl class="card-body grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2">
|
||||||
<dt class="text-slate-500"><%= t(".date") %></dt><dd><%= fmt_date(@record.date_performed) %></dd>
|
<div class="detail-row"><dt><%= t(".date") %></dt><dd><%= fmt_date(@record.date_performed) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".aircraft_hours") %></dt><dd><%= hours(@record.aircraft_hours) %></dd>
|
<div class="detail-row"><dt><%= t(".aircraft_hours") %></dt><dd><%= hours(@record.aircraft_hours) %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".performed_by") %></dt><dd><%= @record.performed_by.presence || "—" %></dd>
|
<div class="detail-row"><dt><%= t(".performed_by") %></dt><dd><%= @record.performed_by.presence || "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".component") %></dt><dd><%= @record.component || "—" %></dd>
|
<div class="detail-row"><dt><%= t(".component") %></dt><dd><%= @record.component || "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".form_337") %></dt><dd><%= @record.form_337_document ? link_to(@record.form_337_document.name, aircraft_document_path(@aircraft, @record.form_337_document), class: "link") : "—" %></dd>
|
<div class="detail-row"><dt><%= t(".form_337") %></dt><dd><%= @record.form_337_document ? link_to(@record.form_337_document.name, aircraft_document_path(@aircraft, @record.form_337_document), class: "link") : "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".stc") %></dt><dd><%= [@record.stc_number, @record.stc_holder].compact_blank.join(" · ").presence || "—" %>
|
<div class="detail-row"><dt><%= t(".stc") %></dt><dd><%= [@record.stc_number, @record.stc_holder].compact_blank.join(" · ").presence || "—" %>
|
||||||
<%= link_to(t(".docs"), aircraft_document_path(@aircraft, @record.stc_document), class: "link") if @record.stc_document %></dd>
|
<%= link_to(t(".docs"), aircraft_document_path(@aircraft, @record.stc_document), class: "link") if @record.stc_document %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".logbook") %></dt><dd><%= @record.logbook_entry ? link_to(@record.logbook_entry.date, aircraft_logbook_entry_path(@aircraft, @record.logbook_entry), class: "link") : "—" %></dd>
|
<div class="detail-row"><dt><%= t(".logbook") %></dt><dd><%= @record.logbook_entry ? link_to(@record.logbook_entry.date, aircraft_logbook_entry_path(@aircraft, @record.logbook_entry), class: "link") : "—" %></dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".weight_balance") %></dt>
|
<div class="detail-row"><dt><%= t(".weight_balance") %></dt>
|
||||||
<dd>
|
<dd>
|
||||||
<% if (wb = @aircraft.weight_balance_records.where(major_record: @record).recent_first.first) %>
|
<% if (wb = @aircraft.weight_balance_records.where(major_record: @record).recent_first.first) %>
|
||||||
<%= link_to t(".lb_in", date: fmt_date(wb.date), weight: number_with_precision(wb.empty_weight, precision: 1), arm: number_with_precision(wb.empty_arm, precision: 2)), aircraft_weight_balance_records_path(@aircraft), class: "link" %>
|
<%= link_to t(".lb_in", date: fmt_date(wb.date), weight: number_with_precision(wb.empty_weight, precision: 1), arm: number_with_precision(wb.empty_arm, precision: 2)), aircraft_weight_balance_records_path(@aircraft), class: "link" %>
|
||||||
<% elsif owner? %>
|
<% elsif owner? %>
|
||||||
<%= link_to t(".record_the_new_w_b"), new_aircraft_weight_balance_record_path(@aircraft, major_record_id: @record.id), class: "link" %>
|
<%= link_to t(".record_the_new_w_b"), new_aircraft_weight_balance_record_path(@aircraft, major_record_id: @record.id), class: "link" %>
|
||||||
<% else %>—<% end %>
|
<% else %>—<% end %>
|
||||||
</dd>
|
</dd></div>
|
||||||
<dt class="text-slate-500"><%= t(".icas") %></dt>
|
<div class="detail-row"><dt><%= t(".icas") %></dt>
|
||||||
<dd>
|
<dd>
|
||||||
<%= @record.has_ica? ? t(".yes") : t(".no") %>
|
<%= @record.has_ica? ? t(".yes") : t(".no") %>
|
||||||
<% if (ica = @record.ica_inspection_type) %>
|
<% if (ica = @record.ica_inspection_type) %>
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
<% elsif @record.has_ica? && owner? %>
|
<% elsif @record.has_ica? && owner? %>
|
||||||
· <%= link_to t(".add_the_ica_s_recurring"), new_aircraft_inspection_type_path(@aircraft, major_record_id: @record.id), class: "link" %>
|
· <%= link_to t(".add_the_ica_s_recurring"), new_aircraft_inspection_type_path(@aircraft, major_record_id: @record.id), class: "link" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</dd>
|
</dd></div>
|
||||||
</dl>
|
</dl>
|
||||||
<% [[t(".description"), @record.description], [t(".ica_notes"), @record.ica_notes], [t(".notes"), @record.notes]].each do |title, text| %>
|
<% [[t(".description"), @record.description], [t(".ica_notes"), @record.ica_notes], [t(".notes"), @record.notes]].each do |title, text| %>
|
||||||
<% if text.present? %><div class="border-t border-slate-100 px-4 py-3 text-sm"><h3 class="mb-1 font-medium"><%= title %></h3><%= simple_format text %></div><% end %>
|
<% if text.present? %><div class="border-t border-slate-100 px-4 py-3 text-sm"><h3 class="mb-1 font-medium"><%= title %></h3><%= simple_format text %></div><% end %>
|
||||||
|
|||||||
+138
-129
@@ -1,138 +1,147 @@
|
|||||||
<h1 class="mb-4 text-2xl font-bold"><%= t(".your_profile") %></h1>
|
<h1 class="mb-4 text-2xl font-bold"><%= t(".your_profile") %></h1>
|
||||||
<%= form_with model: @user, url: profile_path, method: :patch, class: "card card-body space-y-4 max-w-md" do |f| %>
|
<%# One column on a phone; on a wide screen, the account and its security on
|
||||||
<%= f.errors_summary %>
|
the left and everything else on the right. %>
|
||||||
<%= f.field :name %>
|
<div class="grid max-w-5xl items-start gap-5 lg:grid-cols-2">
|
||||||
<%= f.field :email_address, as: :email, label: t(".email") %>
|
<div class="space-y-5">
|
||||||
<%= f.field :reminder_emails, as: :checkbox, label: t(".weekly_maintenance_reminders"),
|
<%= form_with model: @user, url: profile_path, method: :patch, class: "card card-body space-y-4" do |f| %>
|
||||||
hint: t(MailSettings.configured? ? ".a_monday_email_about_overdue" : ".reminders_once_email_set_up") %>
|
<h2 class="card-title"><%= t(".account") %></h2>
|
||||||
<div>
|
<%= f.errors_summary %>
|
||||||
<%= f.label :time_zone, t(".time_zone"), class: "label" %>
|
<%= f.field :name %>
|
||||||
<%= f.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones,
|
<%= f.field :email_address, as: :email, label: t(".email") %>
|
||||||
{ include_blank: t(".time_zone_automatic", zone: device_time_zone_label || t(".time_zone_unknown")) },
|
<%= f.field :reminder_emails, as: :checkbox, label: t(".weekly_maintenance_reminders"),
|
||||||
class: "input" %>
|
hint: t(MailSettings.configured? ? ".a_monday_email_about_overdue" : ".reminders_once_email_set_up") %>
|
||||||
<p class="hint"><%= t(".time_zone_hint", now: fmt_time(Time.current)) %></p>
|
<div>
|
||||||
</div>
|
<%= f.label :time_zone, t(".time_zone"), class: "label" %>
|
||||||
<%= f.field :password, as: :password, label: t(".new_password"), hint: t(".leave_blank_to_keep_your", min: User::PASSWORD_MIN), autocomplete: "new-password" %>
|
<%= f.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones,
|
||||||
<%= f.field :password_confirmation, as: :password, label: t(".confirm_new_password"), autocomplete: "new-password" %>
|
{ include_blank: t(".time_zone_automatic", zone: device_time_zone_label || t(".time_zone_unknown")) },
|
||||||
<div>
|
class: "input" %>
|
||||||
<%= label_tag "user[current_password]", t(".current_password"), class: "label" %>
|
<p class="hint"><%= t(".time_zone_hint", now: fmt_time(Time.current)) %></p>
|
||||||
<%= password_field_tag "user[current_password]", nil, id: "user_current_password", class: "input", autocomplete: "current-password" %>
|
</div>
|
||||||
<p class="hint"><%= t(".needed_to_change_your_email_html", sso_uid: (t(".signed_up_with_and_never", so: Sso.label) if Sso.enabled? && @user.sso_uid?)) %></p>
|
<%= f.field :password, as: :password, label: t(".new_password"), hint: t(".leave_blank_to_keep_your", min: User::PASSWORD_MIN), autocomplete: "new-password" %>
|
||||||
</div>
|
<%= f.field :password_confirmation, as: :password, label: t(".confirm_new_password"), autocomplete: "new-password" %>
|
||||||
<%= f.submit t(".save") %>
|
<div>
|
||||||
<% end %>
|
<%= label_tag "user[current_password]", t(".current_password"), class: "label" %>
|
||||||
|
<%= password_field_tag "user[current_password]", nil, id: "user_current_password", class: "input", autocomplete: "current-password" %>
|
||||||
<% if Sso.enabled? %>
|
<p class="hint"><%= t(".needed_to_change_your_email_html", sso_uid: (t(".signed_up_with_and_never", so: Sso.label) if Sso.enabled? && @user.sso_uid?)) %></p>
|
||||||
<section class="card card-body mt-5 max-w-md">
|
</div>
|
||||||
<h2 class="card-title"><%= t(".single_sign_on") %></h2>
|
<%= f.submit t(".save") %>
|
||||||
<% if @user.sso_uid? %>
|
|
||||||
<p class="mt-1 text-sm text-slate-600"><%= t(".your_account_is_linked_to_html", so: Sso.label) %></p>
|
|
||||||
<% if Sso.password_login? %>
|
|
||||||
<div class="mt-3"><%= button_to t(".unlink", so: Sso.label), sso_link_path, method: :delete, class: "btn-secondary btn-sm",
|
|
||||||
form: { data: { turbo_confirm: t(".unlink_you_ll_sign_in", so: Sso.label) } } %></div>
|
|
||||||
<% end %>
|
|
||||||
<% else %>
|
|
||||||
<p class="mt-1 text-sm text-slate-600"><%= t(".link_your_account_to_sign_html", so: Sso.label) %></p>
|
|
||||||
<div class="mt-3"><%= button_to t(".link", so: Sso.label), "/auth/#{Sso::PROVIDER}", class: "btn-secondary btn-sm", data: { turbo: false } %></div>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</section>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<section class="card card-body mt-5 max-w-md" id="two-factor">
|
<% if Sso.enabled? %>
|
||||||
<h2 class="card-title"><%= t(".two_factor_sign_in") %></h2>
|
<section class="card card-body">
|
||||||
<% if @user.otp_enabled? %>
|
<h2 class="card-title"><%= t(".single_sign_on") %></h2>
|
||||||
<p class="mt-1 text-sm text-slate-600"><span class="badge-green"><%= t(".on") %></span> <%= t(".since_signing_in_with_your_html", to_date: (fmt_date(@user.otp_enabled_at.to_date)), recovery_codes_left: @user.recovery_codes_left) %></p>
|
<% if @user.sso_uid? %>
|
||||||
<%= form_with url: two_factor_path, class: "mt-3 flex flex-wrap items-end gap-2" do |f| %>
|
<p class="mt-1 text-sm text-slate-600"><%= t(".your_account_is_linked_to_html", so: Sso.label) %></p>
|
||||||
<div><%= label_tag :code, t(".current_code_or_a_recovery"), class: "label" %><%= text_field_tag :code, nil, required: true, autocomplete: "one-time-code", class: "input w-44" %></div>
|
<% if Sso.password_login? %>
|
||||||
<%= button_tag t(".new_recovery_codes"), type: "submit", formaction: recovery_codes_two_factor_path, class: "btn-secondary btn-sm" %>
|
<div class="mt-3"><%= button_to t(".unlink", so: Sso.label), sso_link_path, method: :delete, class: "btn-secondary btn-sm",
|
||||||
<%= button_tag t(".turn_off"), type: "submit", name: "_method", value: "delete", class: "btn-secondary btn-sm", data: { turbo_confirm: t(".turn_off_two_factor_sign") } %>
|
form: { data: { turbo_confirm: t(".unlink_you_ll_sign_in", so: Sso.label) } } %></div>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<p class="mt-1 text-sm text-slate-600"><%= t(".link_your_account_to_sign_html", so: Sso.label) %></p>
|
||||||
|
<div class="mt-3"><%= button_to t(".link", so: Sso.label), "/auth/#{Sso::PROVIDER}", class: "btn-secondary btn-sm", data: { turbo: false } %></div>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
|
||||||
<p class="mt-1 text-sm text-slate-600"><%= t(".add_a_code_from_an_html", enabled: (t(".signing_in_with_uses_its", so: Sso.label) if Sso.enabled?)) %></p>
|
|
||||||
<div class="mt-3"><%= link_to t(".set_up"), new_two_factor_path, class: "btn-secondary btn-sm" %></div>
|
|
||||||
<% end %>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="card card-body mt-5 max-w-md" id="calendar">
|
<section class="card card-body" id="two-factor">
|
||||||
<h2 class="card-title"><%= t(".calendar_feed") %></h2>
|
<h2 class="card-title"><%= t(".two_factor_sign_in") %></h2>
|
||||||
<p class="mt-1 text-sm text-slate-600"><%= t(".what_s_coming_due_on") %></p>
|
<% if @user.otp_enabled? %>
|
||||||
<% if @user.calendar_token.present? %>
|
<p class="mt-1 text-sm text-slate-600"><span class="badge-green"><%= t(".on") %></span> <%= t(".since_signing_in_with_your_html", to_date: (fmt_date(@user.otp_enabled_at.to_date)), recovery_codes_left: @user.recovery_codes_left) %></p>
|
||||||
<% feed = "#{Sso.app_url}#{calendar_feed_path(@user.calendar_token)}" %>
|
<%= form_with url: two_factor_path, class: "mt-3 flex flex-wrap items-end gap-2" do |f| %>
|
||||||
<input class="input mt-3 font-mono text-xs" value="<%= feed %>" readonly aria-label="<%= t(".calendar_feed_address") %>">
|
<div><%= label_tag :code, t(".current_code_or_a_recovery"), class: "label" %><%= text_field_tag :code, nil, required: true, autocomplete: "one-time-code", class: "input w-44" %></div>
|
||||||
<div class="mt-2 flex flex-wrap gap-2">
|
<%= button_tag t(".new_recovery_codes"), type: "submit", formaction: recovery_codes_two_factor_path, class: "btn-secondary btn-sm" %>
|
||||||
<%= link_to t(".subscribe"), feed.sub(%r{\Ahttps?://}, "webcal://"), class: "btn-secondary btn-sm" %>
|
<%= button_tag t(".turn_off"), type: "submit", name: "_method", value: "delete", class: "btn-secondary btn-sm", data: { turbo_confirm: t(".turn_off_two_factor_sign") } %>
|
||||||
<%= button_to t(".make_a_new_link"), calendar_token_path, class: "btn-secondary btn-sm",
|
<% end %>
|
||||||
form: { data: { turbo_confirm: t(".replace_the_calendar_link_calendars") } } %>
|
<% else %>
|
||||||
</div>
|
<p class="mt-1 text-sm text-slate-600"><%= t(".add_a_code_from_an_html", enabled: (t(".signing_in_with_uses_its", so: Sso.label) if Sso.enabled?)) %></p>
|
||||||
<p class="hint"><%= t(".anyone_with_this_link_can") %></p>
|
<div class="mt-3"><%= link_to t(".set_up"), new_two_factor_path, class: "btn-secondary btn-sm" %></div>
|
||||||
<% else %>
|
|
||||||
<div class="mt-3"><%= button_to t(".create_calendar_link"), calendar_token_path, class: "btn-secondary btn-sm" %></div>
|
|
||||||
<% end %>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="card card-body mt-5 max-w-md" id="certificates">
|
|
||||||
<h2 class="card-title"><%= t(".certificates") %></h2>
|
|
||||||
<p class="mt-1 text-sm text-slate-600"><%= t(".your_faa_certificates_for_signing") %></p>
|
|
||||||
<% if @user.certificates.any? %>
|
|
||||||
<ul class="mt-3 divide-y divide-slate-100 rounded-md ring-1 ring-slate-200">
|
|
||||||
<% @user.certificates.each do |c| %>
|
|
||||||
<li class="flex flex-wrap items-center justify-between gap-2 px-3 py-2 text-sm">
|
|
||||||
<span><span class="font-medium"><%= c.kind_label %></span> · <%= c.number %>
|
|
||||||
<% if c.expires_on %><span class="ml-1 <%= c.expired? ? 'badge-red' : (Date.current + UserCertificate::EXPIRY_WARNING_DAYS >= c.expires_on ? 'badge-orange' : 'badge-gray') %>"><%= c.expired? ? t(".expired") : t(".expires") %> <%= fmt_date(c.expires_on) %></span><% end %></span>
|
|
||||||
<%= button_to t(".remove"), certificate_path(c), method: :delete, class: "btn-secondary btn-sm", form: { data: { turbo_confirm: t(".remove_your_certificate", kind_label: c.kind_label) } } %>
|
|
||||||
</li>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</section>
|
||||||
<% end %>
|
|
||||||
<%= form_with model: UserCertificate.new, url: certificates_path, class: "mt-3 grid gap-2 sm:grid-cols-[1fr_8rem]" do |f| %>
|
|
||||||
<%= f.select :kind, UserCertificate::KINDS.invert, {}, class: "input", "aria-label": t(".kind_of_certificate") %>
|
|
||||||
<%= f.text_field :number, class: "input", placeholder: t(".number"), required: true, maxlength: 40, "aria-label": t(".certificate_number") %>
|
|
||||||
<div class="sm:col-span-2 flex flex-wrap items-end gap-2">
|
|
||||||
<div><%= f.label :expires_on, t(".expires_optional"), class: "label" %><%= f.date_field :expires_on, class: "input" %></div>
|
|
||||||
<%= f.submit t(".add_certificate"), class: "btn-secondary" %>
|
|
||||||
</div>
|
|
||||||
<p class="hint sm:col-span-2"><%= t(".an_inspection_authorization_expires_on") %></p>
|
|
||||||
<% end %>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="card card-body mt-5 max-w-md space-y-4" id="device">
|
<section class="card card-body">
|
||||||
<h2 class="card-title"><%= t(".this_device") %></h2>
|
<h2 class="card-title"><%= t(".sessions") %></h2>
|
||||||
<div data-controller="install">
|
<% others = @user.sessions.where.not(id: Current.session.id).count %>
|
||||||
<h3 class="text-sm font-semibold"><%= t(".install_heading") %></h3>
|
<p class="mt-1 text-sm text-slate-600">
|
||||||
<p class="hint"><%= t(".install_why") %></p>
|
<%= t(".you_re_signed_in_on", count: others) %>
|
||||||
<p class="mt-2 text-sm text-emerald-700" data-install-target="installed" hidden><%= t(".installed") %></p>
|
<%= t(".sessions_unused_for_sign_out_html", days: (Authentication::SESSION_IDLE_TIMEOUT.in_days.to_i)) %>
|
||||||
<button type="button" class="btn-secondary btn-sm mt-2" data-install-target="button" data-action="install#install" hidden><%= t(".install") %></button>
|
</p>
|
||||||
<p class="mt-2 text-sm text-slate-600" data-install-target="ios" hidden><%= t(".install_ios_html") %></p>
|
<% if others.positive? %>
|
||||||
<p class="mt-2 text-sm text-slate-600" data-install-target="other" hidden><%= t(".install_other") %></p>
|
<div class="mt-3"><%= button_to t(".sign_out_everywhere_else"), other_sessions_path, method: :delete, class: "btn-secondary btn-sm" %></div>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
</div>
|
</div>
|
||||||
<div data-controller="push" data-push-key-value="<%= PushKeys.public_key %>" data-push-url-value="<%= push_subscription_path %>" data-push-test-url-value="<%= test_push_subscription_path %>">
|
|
||||||
<h3 class="text-sm font-semibold"><%= t(".notifications_heading") %></h3>
|
<div class="space-y-5">
|
||||||
<p class="hint"><%= t(".notifications_what") %></p>
|
<section class="card card-body" id="calendar">
|
||||||
<p class="mt-2 text-sm text-slate-600" data-push-target="status" role="status"></p>
|
<h2 class="card-title"><%= t(".calendar_feed") %></h2>
|
||||||
<div class="mt-2 flex flex-wrap gap-2">
|
<p class="mt-1 text-sm text-slate-600"><%= t(".what_s_coming_due_on") %></p>
|
||||||
<button type="button" class="btn-secondary btn-sm" data-push-target="on" data-action="push#turnOn" hidden><%= t(".notifications_on") %></button>
|
<% if @user.calendar_token.present? %>
|
||||||
<button type="button" class="btn-secondary btn-sm" data-push-target="off" data-action="push#turnOff" hidden><%= t(".notifications_off") %></button>
|
<% feed = "#{Sso.app_url}#{calendar_feed_path(@user.calendar_token)}" %>
|
||||||
<button type="button" class="btn-secondary btn-sm" data-push-target="test" data-action="push#sendTest" hidden><%= t(".notifications_test") %></button>
|
<input class="input mt-3 font-mono text-xs" value="<%= feed %>" readonly aria-label="<%= t(".calendar_feed_address") %>">
|
||||||
</div>
|
<div class="mt-2 flex flex-wrap gap-2">
|
||||||
|
<%= link_to t(".subscribe"), feed.sub(%r{\Ahttps?://}, "webcal://"), class: "btn-secondary btn-sm" %>
|
||||||
|
<%= button_to t(".make_a_new_link"), calendar_token_path, class: "btn-secondary btn-sm",
|
||||||
|
form: { data: { turbo_confirm: t(".replace_the_calendar_link_calendars") } } %>
|
||||||
|
</div>
|
||||||
|
<p class="hint"><%= t(".anyone_with_this_link_can") %></p>
|
||||||
|
<% else %>
|
||||||
|
<div class="mt-3"><%= button_to t(".create_calendar_link"), calendar_token_path, class: "btn-secondary btn-sm" %></div>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card card-body" id="certificates">
|
||||||
|
<h2 class="card-title"><%= t(".certificates") %></h2>
|
||||||
|
<p class="mt-1 text-sm text-slate-600"><%= t(".your_faa_certificates_for_signing") %></p>
|
||||||
|
<% if @user.certificates.any? %>
|
||||||
|
<ul class="mt-3 divide-y divide-slate-100 rounded-md ring-1 ring-slate-200">
|
||||||
|
<% @user.certificates.each do |c| %>
|
||||||
|
<li class="flex flex-wrap items-center justify-between gap-2 px-3 py-2 text-sm">
|
||||||
|
<span><span class="font-medium"><%= c.kind_label %></span> · <%= c.number %>
|
||||||
|
<% if c.expires_on %><span class="ml-1 <%= c.expired? ? 'badge-red' : (Date.current + UserCertificate::EXPIRY_WARNING_DAYS >= c.expires_on ? 'badge-orange' : 'badge-gray') %>"><%= c.expired? ? t(".expired") : t(".expires") %> <%= fmt_date(c.expires_on) %></span><% end %></span>
|
||||||
|
<%= button_to t(".remove"), certificate_path(c), method: :delete, class: "btn-secondary btn-sm", form: { data: { turbo_confirm: t(".remove_your_certificate", kind_label: c.kind_label) } } %>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
</ul>
|
||||||
|
<% end %>
|
||||||
|
<%= form_with model: UserCertificate.new, url: certificates_path, class: "mt-3 grid gap-2 sm:grid-cols-[1fr_8rem]" do |f| %>
|
||||||
|
<%= f.select :kind, UserCertificate::KINDS.invert, {}, class: "input", "aria-label": t(".kind_of_certificate") %>
|
||||||
|
<%= f.text_field :number, class: "input", placeholder: t(".number"), required: true, maxlength: 40, "aria-label": t(".certificate_number") %>
|
||||||
|
<div class="sm:col-span-2 flex flex-wrap items-end gap-2">
|
||||||
|
<div><%= f.label :expires_on, t(".expires_optional"), class: "label" %><%= f.date_field :expires_on, class: "input" %></div>
|
||||||
|
<%= f.submit t(".add_certificate"), class: "btn-secondary" %>
|
||||||
|
</div>
|
||||||
|
<p class="hint sm:col-span-2"><%= t(".an_inspection_authorization_expires_on") %></p>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card card-body space-y-4" id="device">
|
||||||
|
<h2 class="card-title"><%= t(".this_device") %></h2>
|
||||||
|
<div data-controller="install">
|
||||||
|
<h3 class="text-sm font-semibold"><%= t(".install_heading") %></h3>
|
||||||
|
<p class="hint"><%= t(".install_why") %></p>
|
||||||
|
<p class="mt-2 text-sm text-emerald-700" data-install-target="installed" hidden><%= t(".installed") %></p>
|
||||||
|
<button type="button" class="btn-secondary btn-sm mt-2" data-install-target="button" data-action="install#install" hidden><%= t(".install") %></button>
|
||||||
|
<p class="mt-2 text-sm text-slate-600" data-install-target="ios" hidden><%= t(".install_ios_html") %></p>
|
||||||
|
<p class="mt-2 text-sm text-slate-600" data-install-target="other" hidden><%= t(".install_other") %></p>
|
||||||
|
</div>
|
||||||
|
<div data-controller="push" data-push-key-value="<%= PushKeys.public_key %>" data-push-url-value="<%= push_subscription_path %>" data-push-test-url-value="<%= test_push_subscription_path %>">
|
||||||
|
<h3 class="text-sm font-semibold"><%= t(".notifications_heading") %></h3>
|
||||||
|
<p class="hint"><%= t(".notifications_what") %></p>
|
||||||
|
<p class="mt-2 whitespace-pre-line text-sm text-slate-600" data-push-target="status" role="status"></p>
|
||||||
|
<div class="mt-2 flex flex-wrap gap-2">
|
||||||
|
<button type="button" class="btn-secondary btn-sm" data-push-target="on" data-action="push#turnOn" hidden><%= t(".notifications_on") %></button>
|
||||||
|
<button type="button" class="btn-secondary btn-sm" data-push-target="off" data-action="push#turnOff" hidden><%= t(".notifications_off") %></button>
|
||||||
|
<button type="button" class="btn-secondary btn-sm" data-push-target="test" data-action="push#sendTest" hidden><%= t(".notifications_test") %></button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="card card-body">
|
||||||
|
<h2 class="card-title"><%= t(".integrations") %></h2>
|
||||||
|
<p class="mt-1 text-sm text-slate-600">
|
||||||
|
<%= link_to t(".airtrail_sync"), air_trail_connection_path, class: "link" %>:
|
||||||
|
<%= t(".push_the_flights_you_log_html", off: (current_user.air_trail_connection&.enabled? ? "on" : "off")) %>
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</div>
|
||||||
|
|
||||||
<section class="card card-body mt-5 max-w-md">
|
|
||||||
<h2 class="card-title"><%= t(".sessions") %></h2>
|
|
||||||
<% others = @user.sessions.where.not(id: Current.session.id).count %>
|
|
||||||
<p class="mt-1 text-sm text-slate-600">
|
|
||||||
<%= t(".you_re_signed_in_on", count: others) %>
|
|
||||||
<%= t(".sessions_unused_for_sign_out_html", days: (Authentication::SESSION_IDLE_TIMEOUT.in_days.to_i)) %>
|
|
||||||
</p>
|
|
||||||
<% if others.positive? %>
|
|
||||||
<div class="mt-3"><%= button_to t(".sign_out_everywhere_else"), other_sessions_path, method: :delete, class: "btn-secondary btn-sm" %></div>
|
|
||||||
<% end %>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="card card-body mt-5 max-w-md">
|
|
||||||
<h2 class="card-title"><%= t(".integrations") %></h2>
|
|
||||||
<p class="mt-1 text-sm text-slate-600">
|
|
||||||
<%= link_to t(".airtrail_sync"), air_trail_connection_path, class: "link" %>:
|
|
||||||
<%= t(".push_the_flights_you_log_html", off: (current_user.air_trail_connection&.enabled? ? "on" : "off")) %>
|
|
||||||
</p>
|
|
||||||
</section>
|
|
||||||
@@ -64,7 +64,7 @@ self.addEventListener("fetch", (event) => {
|
|||||||
.catch(() => caches.match(url.pathname)))
|
.catch(() => caches.match(url.pathname)))
|
||||||
} else if (url.pathname.startsWith("/assets/")) {
|
} else if (url.pathname.startsWith("/assets/")) {
|
||||||
event.respondWith(cachedAsset(request))
|
event.respondWith(cachedAsset(request))
|
||||||
} else if (url.pathname.startsWith("/rails/active_storage/blobs/redirect/")) {
|
} else if (/^\/rails\/active_storage\/(blobs|representations)\/redirect\//.test(url.pathname)) {
|
||||||
// Uploaded files come from the network; an aircraft photo saved for
|
// Uploaded files come from the network; an aircraft photo saved for
|
||||||
// offline use stands in when there's none.
|
// offline use stands in when there's none.
|
||||||
event.respondWith(fetch(request)
|
event.respondWith(fetch(request)
|
||||||
@@ -80,11 +80,12 @@ const savedImage = async (request, response) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Photo links carry an expiry, so they change with every page; the saved copy
|
// Photo links carry an expiry, so they change with every page; the saved copy
|
||||||
// is filed under the upload's id instead (same rule in offline_prep_controller.js).
|
// is filed under the upload's id (and size) instead (same rule in offline_prep_controller.js).
|
||||||
function imageKey(url) {
|
function imageKey(url) {
|
||||||
try {
|
try {
|
||||||
const signed = new URL(url, self.location.origin).pathname.match(/\/blobs\/redirect\/([^/]+?)--/)[1]
|
const [ , signed, size ] = new URL(url, self.location.origin).pathname.match(/\/(?:blobs|representations)\/redirect\/([^/]+?)--[^/]+\/(?:([^/]+)\/)?/)
|
||||||
return `${self.location.origin}/offline-image/${JSON.parse(atob(decodeURIComponent(signed)))._rails.data}`
|
const id = JSON.parse(atob(decodeURIComponent(signed)))._rails.data
|
||||||
|
return `${self.location.origin}/offline-image/${id}${size ? `/${size}` : ""}`
|
||||||
} catch (_) { return null }
|
} catch (_) { return null }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
<p class="mb-4 text-sm text-slate-600"><%= t(".create_the_administrator_account_to") %></p>
|
<p class="mb-4 text-sm text-slate-600"><%= t(".create_the_administrator_account_to") %></p>
|
||||||
<%= form_with model: @user, url: setup_path, class: "card card-body space-y-4" do |f| %>
|
<%= form_with model: @user, url: setup_path, class: "card card-body space-y-4" do |f| %>
|
||||||
<%= f.errors_summary %>
|
<%= f.errors_summary %>
|
||||||
|
<div>
|
||||||
|
<%= label_tag :setup_code, t(".setup_code"), class: "label" %>
|
||||||
|
<%= text_field_tag :setup_code, params[:setup_code], required: true, autocomplete: "off", autocapitalize: "characters", spellcheck: false,
|
||||||
|
class: "input font-mono tracking-widest", placeholder: "XXXX-XXXX" %>
|
||||||
|
<p class="hint"><%= t(".setup_code_hint_html") %></p>
|
||||||
|
</div>
|
||||||
<%= f.field :name %>
|
<%= f.field :name %>
|
||||||
<%= f.field :email_address, as: :email, label: t(".email"), required: true %>
|
<%= f.field :email_address, as: :email, label: t(".email"), required: true %>
|
||||||
<%= f.field :password, as: :password, required: true, hint: t(".at_least_characters_not_one", min: User::PASSWORD_MIN) %>
|
<%= f.field :password, as: :password, required: true, hint: t(".at_least_characters_not_one", min: User::PASSWORD_MIN) %>
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
<% aw = aircraft.airworthiness %>
|
<% aw = aircraft.airworthiness %>
|
||||||
<div class="mb-4 flex flex-wrap items-center justify-between gap-3">
|
<div class="mb-4 flex flex-wrap items-center justify-between gap-3">
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
<% if aircraft.picture.attached? %>
|
<% if aircraft.picture_shown? %>
|
||||||
<%= image_tag aircraft.picture, class: "h-12 w-12 rounded-md object-cover", alt: "" %>
|
<%= image_tag aircraft.picture_for(:thumb), width: 48, height: 48, class: "h-12 w-12 rounded-md object-cover", alt: "" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div>
|
<div>
|
||||||
<h1 class="text-2xl font-bold tracking-tight">
|
<h1 class="text-2xl font-bold tracking-tight">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<% content_for :title, @aircraft.tail_number %>
|
<% content_for :title, @aircraft.tail_number %>
|
||||||
<div class="mb-5 flex flex-wrap items-center justify-between gap-3">
|
<div class="mb-5 flex flex-wrap items-center justify-between gap-3">
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
<% if @aircraft.picture.attached? %><%= image_tag rails_blob_path(@aircraft.picture, disposition: :inline), class: "h-16 w-16 rounded-md object-cover", alt: t(".photo_of", tail_number: @aircraft.tail_number) %><% end %>
|
<% if @aircraft.picture_shown? %><%= image_tag @aircraft.picture_for(:thumb), width: 64, height: 64, class: "h-16 w-16 rounded-md object-cover", alt: t(".photo_of", tail_number: @aircraft.tail_number) %><% end %>
|
||||||
<div>
|
<div>
|
||||||
<h1 class="text-2xl font-bold"><%= @aircraft.tail_number %> <span class="text-base font-normal text-slate-500"><%= [@aircraft.make, @aircraft.model].compact_blank.join(" ") %></span></h1>
|
<h1 class="text-2xl font-bold"><%= @aircraft.tail_number %> <span class="text-base font-normal text-slate-500"><%= [@aircraft.make, @aircraft.model].compact_blank.join(" ") %></span></h1>
|
||||||
<div class="mt-1 flex flex-wrap items-center gap-2 text-sm">
|
<div class="mt-1 flex flex-wrap items-center gap-2 text-sm">
|
||||||
|
|||||||
@@ -100,12 +100,26 @@ Rails.application.configure do
|
|||||||
# Only use :id for inspections in production.
|
# Only use :id for inspections in production.
|
||||||
config.active_record.attributes_for_inspect = [ :id ]
|
config.active_record.attributes_for_inspect = [ :id ]
|
||||||
|
|
||||||
# Enable DNS rebinding protection and other `Host` header attacks.
|
# Answer only for the app's own names (stops DNS rebinding and forged Host
|
||||||
# config.hosts = [
|
# headers): APP_HOST, the APP_URL host, ALLOWED_HOSTS, localhost and IP
|
||||||
# "example.com", # Allow requests from example.com
|
# addresses (a rebinding attack needs a name). Off when APP_HOST isn't set.
|
||||||
# /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
|
if ENV["APP_HOST"].present?
|
||||||
# ]
|
config.hosts = [
|
||||||
#
|
ENV["APP_HOST"].sub(/:\d+\z/, ""),
|
||||||
# Skip DNS rebinding protection for the default health check endpoint.
|
(URI.parse(ENV["APP_URL"]).host if ENV["APP_URL"].present?),
|
||||||
# config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
|
*ENV.fetch("ALLOWED_HOSTS", "").split(",").map(&:strip),
|
||||||
|
"localhost",
|
||||||
|
IPAddr.new("0.0.0.0/0"),
|
||||||
|
IPAddr.new("::/0")
|
||||||
|
].compact_blank
|
||||||
|
config.host_authorization = {
|
||||||
|
exclude: ->(request) { request.path == "/up" },
|
||||||
|
# Say why, rather than a blank page: usually a name that's simply missing.
|
||||||
|
response_app: ->(env) {
|
||||||
|
host = ActionDispatch::Request.new(env).host.to_s.gsub(/[^a-z0-9.\-:\[\]]/i, "").first(253)
|
||||||
|
[ 403, { "content-type" => "text/plain; charset=utf-8" },
|
||||||
|
[ "This server doesn't answer for \"#{host}\". If that's a name for this app, add it to ALLOWED_HOSTS (comma-separated) and restart.\n" ] ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# Uploads that claim to be images but can't be read as one (empty, corrupt,
|
||||||
|
# or another kind of file with an image name): if resizing fails, send the
|
||||||
|
# original rather than an error.
|
||||||
|
Rails.application.config.to_prepare do
|
||||||
|
ActiveStorage::Representations::BaseController.rescue_from(Vips::Error, ActiveStorage::InvariableError) do
|
||||||
|
redirect_to Rails.application.routes.url_helpers.rails_blob_path(@blob, disposition: params[:disposition], only_path: true)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
# Refuse to run in production with a guessable secret key (see SecretKeyCheck).
|
||||||
|
# Skipped for the image build's asset step, which uses a throwaway key.
|
||||||
|
if Rails.env.production? && ENV["SECRET_KEY_BASE"].present? && ENV["SECRET_KEY_BASE_DUMMY"].blank?
|
||||||
|
Rails.application.config.after_initialize { SecretKeyCheck.verify! }
|
||||||
|
end
|
||||||
+19
-2
@@ -301,6 +301,7 @@ en:
|
|||||||
attributes:
|
attributes:
|
||||||
parent_component:
|
parent_component:
|
||||||
itself: can't be itself
|
itself: can't be itself
|
||||||
|
own_part: can't be one of its own parts
|
||||||
other_aircraft: must be on the same aircraft
|
other_aircraft: must be on the same aircraft
|
||||||
user:
|
user:
|
||||||
attributes:
|
attributes:
|
||||||
@@ -704,6 +705,9 @@ en:
|
|||||||
envelope_weights: Envelope weights must be more than 0
|
envelope_weights: Envelope weights must be more than 0
|
||||||
fuel_weight: Fuel weight per gallon must be between 4 and 9 lb
|
fuel_weight: Fuel weight per gallon must be between 4 and 9 lb
|
||||||
flash:
|
flash:
|
||||||
|
push_subscriptions:
|
||||||
|
not_saved: "This browser's push service (%{host}) isn't one the app sends to."
|
||||||
|
unknown_device: Unknown browser
|
||||||
sign_in_links:
|
sign_in_links:
|
||||||
try_again_later: Try again later.
|
try_again_later: Try again later.
|
||||||
try_again_later_2: Try again later.
|
try_again_later_2: Try again later.
|
||||||
@@ -826,6 +830,8 @@ en:
|
|||||||
unreachable: couldn't reach or verify %{provider}; see the server log
|
unreachable: couldn't reach or verify %{provider}; see the server log
|
||||||
setup:
|
setup:
|
||||||
welcome_you_re_the: Welcome! You're the administrator. Add your first aircraft.
|
welcome_you_re_the: Welcome! You're the administrator. Add your first aircraft.
|
||||||
|
wrong_code: That setup code isn't right. It's in the server's log, on the line starting "Setup code".
|
||||||
|
try_again_later: Too many tries. Wait a few minutes and try again.
|
||||||
invited_signings:
|
invited_signings:
|
||||||
try_again_later: Try again later.
|
try_again_later: Try again later.
|
||||||
sign_in_to_continue: Sign in to continue.
|
sign_in_to_continue: Sign in to continue.
|
||||||
@@ -914,6 +920,7 @@ en:
|
|||||||
certificate_removed: Certificate removed.
|
certificate_removed: Certificate removed.
|
||||||
application:
|
application:
|
||||||
admins_only: Admins only.
|
admins_only: Admins only.
|
||||||
|
invalid_input: Something in that form couldn't be saved. Check what you entered and try again.
|
||||||
oil_analyses:
|
oil_analyses:
|
||||||
oil_analysis_saved: Oil analysis saved.
|
oil_analysis_saved: Oil analysis saved.
|
||||||
choose_a_lab_report: Choose a lab report PDF.
|
choose_a_lab_report: Choose a lab report PDF.
|
||||||
@@ -2940,6 +2947,7 @@ en:
|
|||||||
profiles:
|
profiles:
|
||||||
edit:
|
edit:
|
||||||
your_profile: Your Profile
|
your_profile: Your Profile
|
||||||
|
account: Account
|
||||||
email: Email
|
email: Email
|
||||||
weekly_maintenance_reminders: Weekly maintenance reminders
|
weekly_maintenance_reminders: Weekly maintenance reminders
|
||||||
a_monday_email_about_overdue: A Monday email about overdue and upcoming inspections, ADs, parts and documents on aircraft you own, and certificates of yours about to expire. Only sent when something needs attention.
|
a_monday_email_about_overdue: A Monday email about overdue and upcoming inspections, ADs, parts and documents on aircraft you own, and certificates of yours about to expire. Only sent when something needs attention.
|
||||||
@@ -3105,6 +3113,8 @@ en:
|
|||||||
new:
|
new:
|
||||||
welcome: Welcome
|
welcome: Welcome
|
||||||
create_the_administrator_account_to: Create the administrator account to get started.
|
create_the_administrator_account_to: Create the administrator account to get started.
|
||||||
|
setup_code: Setup code
|
||||||
|
setup_code_hint_html: 'Shown in the server''s log, so only whoever runs the server can finish setup. With Docker: <code>docker compose logs web | grep "Setup code"</code>'
|
||||||
email: Email
|
email: Email
|
||||||
at_least_characters_not_one: At least %{min} characters; not one known from a data breach.
|
at_least_characters_not_one: At least %{min} characters; not one known from a data breach.
|
||||||
simple_aircraft_manager_is_provided: Simple Aircraft Manager is provided as is, without warranty, and is not approved by the FAA or any other aviation authority. It is up to you to verify that using it for your aircraft and operation is legal and suitable. The full disclaimer is under Help once you're signed in.
|
simple_aircraft_manager_is_provided: Simple Aircraft Manager is provided as is, without warranty, and is not approved by the FAA or any other aviation authority. It is up to you to verify that using it for your aircraft and operation is legal and suitable. The full disclaimer is under Help once you're signed in.
|
||||||
@@ -3667,6 +3677,8 @@ en:
|
|||||||
signed_event: Logbook entry signed electronically (%{date})
|
signed_event: Logbook entry signed electronically (%{date})
|
||||||
air_trail:
|
air_trail:
|
||||||
can_t_reach_airtrail_at: 'Can''t reach AirTrail at %{host}: %{message}'
|
can_t_reach_airtrail_at: 'Can''t reach AirTrail at %{host}: %{message}'
|
||||||
|
blocked_never: "%{host} is this server or a link-local address, which AirTrail can't be."
|
||||||
|
blocked_private: "%{host} is on the private network. Ask an administrator to connect it, or to list it in AIRTRAIL_ALLOWED_HOSTS."
|
||||||
airtrail_username_must_be_3: AirTrail username must be 3–20 letters, numbers, “.”, “_” or “-”
|
airtrail_username_must_be_3: AirTrail username must be 3–20 letters, numbers, “.”, “_” or “-”
|
||||||
aircraft_type_must_be_an: Aircraft type must be an ICAO type designator like C150 (up to 4 letters/numbers)
|
aircraft_type_must_be_an: Aircraft type must be an ICAO type designator like C150 (up to 4 letters/numbers)
|
||||||
no_flights_to_export: No flights to export
|
no_flights_to_export: No flights to export
|
||||||
@@ -3876,8 +3888,13 @@ en:
|
|||||||
blocked: Notifications are blocked for this site in the browser's settings.
|
blocked: Notifications are blocked for this site in the browser's settings.
|
||||||
unsupported: This browser can't show notifications from the app.
|
unsupported: This browser can't show notifications from the app.
|
||||||
ios_install_first: On iPhone and iPad, install the app first (above); notifications can then be turned on in it.
|
ios_install_first: On iPhone and iPad, install the app first (above); notifications can then be turned on in it.
|
||||||
failed: Couldn't turn notifications on. Try again.
|
failed: "Couldn't turn notifications on: %{reason}"
|
||||||
test_sent: Test notification sent; it should arrive in a few seconds.
|
not_saved: "Notifications are on in this browser, but the app couldn't record it: %{reason}"
|
||||||
|
test_sending: Sending…
|
||||||
|
test_none: No device has notifications on. Turn them on again here.
|
||||||
|
test_ok: "%{device}: sent"
|
||||||
|
test_failed: "%{device}: not sent (%{reason})"
|
||||||
|
test_hint: Sent ones should arrive within a few seconds. If this device's doesn't, check that notifications are allowed for the app in the phone's settings.
|
||||||
hours:
|
hours:
|
||||||
tach: Tach %{from} → %{to} (%{delta})
|
tach: Tach %{from} → %{to} (%{delta})
|
||||||
hobbs: Hobbs %{from} → %{to} (%{delta})
|
hobbs: Hobbs %{from} → %{to} (%{delta})
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# Directly on the internet, with HTTPS and no proxy in front: the image's web
|
||||||
|
# server (Thruster) gets and renews a Let's Encrypt certificate by itself.
|
||||||
|
#
|
||||||
|
# 1. Point a DNS name (A/AAAA record) at this server, and open ports 80 and
|
||||||
|
# 443 to it (80 is needed for the certificate check and redirects).
|
||||||
|
# 2. In .env: APP_HOST and TLS_DOMAIN set to that name, FORCE_SSL=true, and
|
||||||
|
# a SECRET_KEY_BASE from `bin/rails secret`.
|
||||||
|
# 3. docker compose -f docker-compose.direct.yml up -d
|
||||||
|
# 4. Open https://<name>, and create the admin account with the setup code
|
||||||
|
# from: docker compose -f docker-compose.direct.yml logs web | grep "Setup code"
|
||||||
|
#
|
||||||
|
# The certificate is kept in the storage volume, so it isn't requested again
|
||||||
|
# on every start.
|
||||||
|
services:
|
||||||
|
web:
|
||||||
|
image: barrettefab/simple-aircraft-manager-rails:latest # or your own image, or: build: .
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
|
env_file: .env
|
||||||
|
environment:
|
||||||
|
SOLID_QUEUE_IN_PUMA: "true" # nightly backup, reminders and AD search run in the web process
|
||||||
|
FORCE_SSL: "true"
|
||||||
|
volumes:
|
||||||
|
- sam_storage:/rails/storage # databases, uploaded files, nightly backups and the certificate: back this up
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-fsS", "http://localhost/up"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
volumes:
|
||||||
|
sam_storage:
|
||||||
@@ -103,7 +103,7 @@ Run on the server like the account recovery commands (`docker compose exec web`
|
|||||||
|
|
||||||
| Command | What it does |
|
| Command | What it does |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `bin/rails sam:doctor` | Health report: secret key, address, HTTPS, email (SMTP reachable), single sign-on (issuer reachable), Google Drive, migrations, disk space, background jobs, and how recent the backup, records check, off-site copy, procedures and audit are. Exits non-zero if something fails |
|
| `bin/rails sam:doctor` | Health report: secret key (set and long enough), address, HTTPS, email (SMTP reachable), single sign-on (issuer reachable), Google Drive, migrations, disk space, background jobs, and how recent the backup, records check, off-site copy, procedures and audit are. Exits non-zero if something fails |
|
||||||
| `bin/rails records:check` | Backs up the database now and checks the record history and every signature; prints any problems and exits non-zero |
|
| `bin/rails records:check` | Backs up the database now and checks the record history and every signature; prints any problems and exits non-zero |
|
||||||
| `bin/rails backups:list` | Lists the nightly database copies |
|
| `bin/rails backups:list` | Lists the nightly database copies |
|
||||||
| `bin/rails "backups:restore[file]"` | Replaces the database with a backup (newest nightly copy if no file; a Google Drive `.sqlite3.gz` works too). The app must be stopped: `docker compose stop web`, then `docker compose run --rm web bin/rails backups:restore`. The current database is moved to `storage/pre-restore-…`, never deleted. `CONFIRM=yes` skips the question |
|
| `bin/rails "backups:restore[file]"` | Replaces the database with a backup (newest nightly copy if no file; a Google Drive `.sqlite3.gz` works too). The app must be stopped: `docker compose stop web`, then `docker compose run --rm web bin/rails backups:restore`. The current database is moved to `storage/pre-restore-…`, never deleted. `CONFIRM=yes` skips the question |
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ If you've set up an authenticator app (see [Your profile](profile.md#two-factor-
|
|||||||
|
|
||||||
After 10 failed tries in a row (wrong passwords or codes), an account is locked for 15 minutes and its owner is emailed. Wait, or ask the administrator to unlock it.
|
After 10 failed tries in a row (wrong passwords or codes), an account is locked for 15 minutes and its owner is emailed. Wait, or ask the administrator to unlock it.
|
||||||
|
|
||||||
The very first visit to a new installation asks for the administrator account instead.
|
The very first visit to a new installation asks for the administrator account instead. It also asks for a one-time setup code, which is printed only in the server's log (the line starting `Setup code`; with Docker, `docker compose logs web | grep "Setup code"`), so only whoever runs the server can create that account.
|
||||||
|
|
||||||
## Roles
|
## Roles
|
||||||
|
|
||||||
|
|||||||
@@ -55,3 +55,5 @@ Turn it on on each phone or computer you want them on; **Send a test** checks it
|
|||||||
## Integrations: AirTrail
|
## Integrations: AirTrail
|
||||||
|
|
||||||
**AirTrail sync** pushes the flights you log to your AirTrail flight map, with their GPS tracks. In AirTrail, create an API key (Settings → Security) with the scopes shown, then paste your AirTrail address and key here. A full sync first links flights already in AirTrail, so nothing is duplicated. If an airport code can't be matched, enter the code AirTrail uses for it.
|
**AirTrail sync** pushes the flights you log to your AirTrail flight map, with their GPS tracks. In AirTrail, create an API key (Settings → Security) with the scopes shown, then paste your AirTrail address and key here. A full sync first links flights already in AirTrail, so nothing is duplicated. If an airport code can't be matched, enter the code AirTrail uses for it.
|
||||||
|
|
||||||
|
If your AirTrail server is on your private network (an address like 192.168.x.x or 10.x.x.x), only an administrator can connect to it, unless the administrator lists it in `AIRTRAIL_ALLOWED_HOSTS`. This stops accounts from using the app to probe the private network. The app's own server and link-local addresses can't be used at all.
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
require "test_helper"
|
||||||
|
|
||||||
|
# Protections for an installation reachable from the internet with nothing in
|
||||||
|
# front of it: secret key strength, the setup code, the AirTrail address check
|
||||||
|
# and the allowed host names.
|
||||||
|
class InternetExposureTest < ActionDispatch::IntegrationTest
|
||||||
|
test "a placeholder or short secret key is refused; one shorter than recommended is weak" do
|
||||||
|
assert_equal :unsafe, SecretKeyCheck.strength("change-me")
|
||||||
|
assert_equal :unsafe, SecretKeyCheck.strength("x")
|
||||||
|
assert_equal :unsafe, SecretKeyCheck.strength("a" * 80)
|
||||||
|
assert_equal :weak, SecretKeyCheck.strength(SecureRandom.hex(20))
|
||||||
|
assert_equal :ok, SecretKeyCheck.strength(SecureRandom.hex(64))
|
||||||
|
end
|
||||||
|
|
||||||
|
test "the setup code is required, shown only in the log, and used up" do
|
||||||
|
SetupCode.clear
|
||||||
|
logged = capture_log { get new_setup_path }
|
||||||
|
assert_match(/Setup code: #{Regexp.escape(SetupCode.current)}/, logged)
|
||||||
|
assert_no_match SetupCode.current, response.body
|
||||||
|
end
|
||||||
|
|
||||||
|
test "AirTrail can't be pointed at the server itself or link-local addresses, nor the private network by non-admins" do
|
||||||
|
{ "http://127.0.0.1:8080" => :never, "http://169.254.169.254" => :never, "http://[::1]" => :never,
|
||||||
|
"http://10.0.0.5" => :private, "http://192.168.1.20:3000" => :private, "http://100.100.1.1" => :private }.each do |url, reason|
|
||||||
|
error = assert_raises(AirTrailClient::BlockedAddress, url) { AirTrailClient.new(base_url: url, api_key: "k").me }
|
||||||
|
assert_match(reason == :never ? "link-local" : "private network", error.message)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
test "admins and listed hosts may use private addresses, but never the server itself" do
|
||||||
|
stub_request(:get, "http://192.168.1.20:3000/api/v1/me").to_return(status: 200, body: { data: { username: "u" } }.to_json)
|
||||||
|
assert_equal "u", AirTrailClient.new(base_url: "http://192.168.1.20:3000", api_key: "k", allow_private: true).me["username"]
|
||||||
|
assert_raises(AirTrailClient::BlockedAddress) { AirTrailClient.new(base_url: "http://127.0.0.1", api_key: "k", allow_private: true).me }
|
||||||
|
|
||||||
|
with_env("AIRTRAIL_ALLOWED_HOSTS" => "airtrail.lan") do
|
||||||
|
resolving_to("192.168.1.30") do
|
||||||
|
stub_request(:get, "http://airtrail.lan/api/v1/me").to_return(status: 200, body: { data: { username: "v" } }.to_json)
|
||||||
|
assert_equal "v", AirTrailClient.new(base_url: "http://airtrail.lan", api_key: "k").me["username"]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a name that resolves to a private address is checked by its address" do
|
||||||
|
resolving_to("203.0.113.5", "10.1.2.3") do
|
||||||
|
assert_raises(AirTrailClient::BlockedAddress) { AirTrailClient.new(base_url: "https://rebind.example.com", api_key: "k").me }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a non-admin's connection to a private address is refused with a reason" do
|
||||||
|
pilot = create_user
|
||||||
|
sign_in pilot
|
||||||
|
post air_trail_connection_path, params: { air_trail_connection: { base_url: "http://192.168.1.20", api_key: "k" } }
|
||||||
|
follow_redirect! if response.redirect?
|
||||||
|
assert_match "private network", flash[:alert].to_s + response.body
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def resolving_to(*ips)
|
||||||
|
old = AirTrailClient.resolver
|
||||||
|
AirTrailClient.resolver = ->(_) { ips }
|
||||||
|
yield
|
||||||
|
ensure
|
||||||
|
AirTrailClient.resolver = old
|
||||||
|
end
|
||||||
|
|
||||||
|
def with_env(vars)
|
||||||
|
old = vars.keys.to_h { [ _1, ENV[_1] ] }
|
||||||
|
vars.each { ENV[_1] = _2 }
|
||||||
|
yield
|
||||||
|
ensure
|
||||||
|
old.each { ENV[_1] = _2 }
|
||||||
|
end
|
||||||
|
|
||||||
|
def capture_log
|
||||||
|
io = StringIO.new
|
||||||
|
logger = ActiveSupport::Logger.new(io)
|
||||||
|
old, Rails.logger = Rails.logger, logger
|
||||||
|
yield
|
||||||
|
io.string
|
||||||
|
ensure
|
||||||
|
Rails.logger = old
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
require "test_helper"
|
||||||
|
|
||||||
|
# Requests no form sends, found by fuzzing: each used to be a server error.
|
||||||
|
class MalformedInputTest < ActionDispatch::IntegrationTest
|
||||||
|
setup do
|
||||||
|
@owner = create_user("owner@example.com")
|
||||||
|
@a = create_aircraft(owner: @owner)
|
||||||
|
sign_in @owner
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a page in a format it doesn't have is 'not acceptable', not an error" do
|
||||||
|
%w[pdf json csv zip xml].each do |ext|
|
||||||
|
get "/aircraft/#{@a.id}/report.#{ext}"
|
||||||
|
assert_response :not_acceptable, ext
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
test "parts can't be made into a loop, and an existing loop doesn't break the pages" do
|
||||||
|
engine = @a.components.create!(component_type: ComponentType.create!(name: "Engine"), manufacturer: "L", model: "O-320", date_in_service: Date.current)
|
||||||
|
mag = @a.components.create!(component_type: ComponentType.create!(name: "Magneto"), manufacturer: "S", model: "4370", date_in_service: Date.current, parent_component: engine)
|
||||||
|
patch aircraft_component_path(@a, engine), params: { component: { parent_component_id: mag.id } }
|
||||||
|
assert_response :unprocessable_entity
|
||||||
|
assert_nil engine.reload.parent_component_id
|
||||||
|
|
||||||
|
engine.update_column(:parent_component_id, mag.id) # as if made before the check existed
|
||||||
|
assert_equal [ mag.id ], engine.reload.ancestor_ids
|
||||||
|
assert_equal [ mag.id ], engine.descendant_ids
|
||||||
|
get new_aircraft_logbook_entry_path(@a)
|
||||||
|
assert_response :success
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a link to a record that doesn't exist is a validation error" do
|
||||||
|
part = @a.components.create!(component_type: ComponentType.create!(name: "Alternator"), manufacturer: "P", model: "ALX", date_in_service: Date.current)
|
||||||
|
patch aircraft_component_path(@a, part), params: { component: { parent_component_id: 999_999 } }
|
||||||
|
assert_response :unprocessable_entity
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a blank required checkbox or number takes its default" do
|
||||||
|
post aircraft_notes_path(@a), params: { aircraft_note: { text: "Blank public", public: "" } }
|
||||||
|
assert_equal false, @a.notes.last.public
|
||||||
|
end
|
||||||
|
|
||||||
|
test "text where a file belongs, or a tampered upload reference, is turned away politely" do
|
||||||
|
post import_aircraft_oil_analyses_path(@a), params: { report: "not a file" }
|
||||||
|
assert_redirected_to new_aircraft_oil_analysis_path(@a)
|
||||||
|
post aircraft_imports_path, params: { archive: "not a file" }
|
||||||
|
assert_redirected_to new_aircraft_import_path
|
||||||
|
post aircraft_logbook_imports_path(@a), params: { pages: [ "not a file" ] }
|
||||||
|
assert_redirected_to new_aircraft_logbook_import_path(@a)
|
||||||
|
|
||||||
|
post aircraft_squawks_path(@a), params: { squawk: { issue_reported: "Leak", attachments: [ "eyJfcmFpbHMiOnt9fQ==--forged" ] } }
|
||||||
|
assert_response :redirect
|
||||||
|
assert_equal "Something in that form couldn't be saved. Check what you entered and try again.", flash[:alert]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a null byte is refused up front" do
|
||||||
|
post aircraft_notes_path(@a), params: { aircraft_note: { text: "a\u0000b" } }
|
||||||
|
assert_response :bad_request
|
||||||
|
assert_equal 0, @a.notes.count
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a number too big to store is turned away politely" do
|
||||||
|
admin = create_user("admin@example.com", admin: true)
|
||||||
|
sign_in admin
|
||||||
|
template = LogbookTemplate.create!(name: "T", log_type: "AC", entry_type: "MAINTENANCE", text: "x")
|
||||||
|
patch admin_logbook_template_path(template), params: { logbook_template: { position: "9" * 40 } }
|
||||||
|
assert_response :redirect
|
||||||
|
assert_match "couldn't be saved", flash[:alert]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a rejected photo shows the form's error, not a server error" do
|
||||||
|
patch aircraft_path(@a), params: { aircraft: { picture: Rack::Test::UploadedFile.new(StringIO.new("<html>not a photo</html>"), "text/html", original_filename: "photo.html") } }
|
||||||
|
assert_response :unprocessable_entity
|
||||||
|
patch aircraft_path(@a), params: { aircraft: { picture: Rack::Test::UploadedFile.new(StringIO.new(""), "image/jpeg", original_filename: "empty.jpg") } }
|
||||||
|
assert_response :unprocessable_entity
|
||||||
|
end
|
||||||
|
|
||||||
|
test "photos measured without dimensions (uploaded before image processing) still get thumbnails" do
|
||||||
|
jpeg = Vips::Image.black(400, 300).jpegsave_buffer
|
||||||
|
@a.picture.attach(io: StringIO.new(jpeg), filename: "old.jpg", content_type: "image/jpeg")
|
||||||
|
@a.picture.blob.update!(metadata: { identified: true, analyzed: true }) # as older uploads were recorded
|
||||||
|
get aircraft_path(@a)
|
||||||
|
assert_select "img[src*='/representations/']"
|
||||||
|
|
||||||
|
squawk = @a.squawks.create!(issue_reported: "Leak", reported_by: @owner)
|
||||||
|
squawk.attachments.attach(io: StringIO.new(jpeg), filename: "PXL_1.jpg", content_type: "image/jpeg")
|
||||||
|
squawk.attachments.first.blob.update!(metadata: { identified: true, analyzed: true })
|
||||||
|
get aircraft_squawks_path(@a)
|
||||||
|
assert_select "a[data-gallery-target=item] img[src*='/representations/']"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "if resizing a photo fails anyway, the original is sent instead of an error" do
|
||||||
|
@a.picture.attach(io: StringIO.new("GIF89a not really"), filename: "broken.gif", content_type: "image/gif")
|
||||||
|
get url_for(@a.picture.variant(:thumb))
|
||||||
|
assert_response :redirect
|
||||||
|
assert_match %r{/rails/active_storage/blobs/redirect/}, response.location
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -57,12 +57,14 @@ class PwaFeaturesTest < ActionDispatch::IntegrationTest
|
|||||||
|
|
||||||
@a.picture.attach(io: StringIO.new(file_fixture_png), filename: "plane.png", content_type: "image/png")
|
@a.picture.attach(io: StringIO.new(file_fixture_png), filename: "plane.png", content_type: "image/png")
|
||||||
get root_path
|
get root_path
|
||||||
picture = JSON.parse(css_select("body").first["data-offline-prep-aircraft-value"]).first["picture"]
|
pictures = JSON.parse(css_select("body").first["data-offline-prep-aircraft-value"]).first["pictures"]
|
||||||
shown = css_select("img[src*='/rails/active_storage/blobs/redirect/']").first["src"]
|
shown = css_select("img[src*='/rails/active_storage/representations/redirect/']").first["src"]
|
||||||
# Links expire, so they differ; both carry the same upload id, which the saved copy is filed under.
|
# Links expire, so they differ; both carry the same upload id and size,
|
||||||
blob_id = ->(url) { JSON.parse(Base64.decode64(CGI.unescape(url[%r{/blobs/redirect/([^/]+?)--}, 1])))["_rails"]["data"] }
|
# which the saved copy is filed under (the thumbnail and the Fleet card).
|
||||||
assert_equal @a.picture.blob.id, blob_id.(picture)
|
key = ->(url) { url.match(%r{/representations/redirect/([^/]+?)--[^/]+/([^/]+)/}).then { [ JSON.parse(Base64.decode64(CGI.unescape(_1[1])))["_rails"]["data"], _1[2] ] } }
|
||||||
assert_equal @a.picture.blob.id, blob_id.(shown)
|
assert_equal 2, pictures.size
|
||||||
|
assert_equal [ @a.picture.blob.id ], pictures.map { key.(_1).first }.uniq
|
||||||
|
assert_includes pictures.map(&key), key.(shown)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "squawks can be reported offline and are received once" do
|
test "squawks can be reported offline and are received once" do
|
||||||
@@ -121,13 +123,34 @@ class PwaFeaturesTest < ActionDispatch::IntegrationTest
|
|||||||
assert_response :created
|
assert_response :created
|
||||||
post push_subscription_path, params: { subscription: subscription_params("https://internal.example.com/b") }, as: :json
|
post push_subscription_path, params: { subscription: subscription_params("https://internal.example.com/b") }, as: :json
|
||||||
assert_response :unprocessable_entity
|
assert_response :unprocessable_entity
|
||||||
|
assert_includes response.parsed_body["error"], "internal.example.com"
|
||||||
assert_equal [ "https://fcm.googleapis.com/fcm/send/a" ], @owner.push_subscriptions.pluck(:endpoint)
|
assert_equal [ "https://fcm.googleapis.com/fcm/send/a" ], @owner.push_subscriptions.pluck(:endpoint)
|
||||||
|
|
||||||
assert_enqueued_with(job: PushNotificationJob) { post test_push_subscription_path, as: :json }
|
|
||||||
delete push_subscription_path, params: { endpoint: "https://fcm.googleapis.com/fcm/send/a" }, as: :json
|
delete push_subscription_path, params: { endpoint: "https://fcm.googleapis.com/fcm/send/a" }, as: :json
|
||||||
assert_empty @owner.push_subscriptions.reload
|
assert_empty @owner.push_subscriptions.reload
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "the test notification is sent now and says which devices took it" do
|
||||||
|
sign_in @owner
|
||||||
|
ok = subscribe(@owner, "https://fcm.googleapis.com/fcm/send/phone")
|
||||||
|
ok.update!(user_agent: "Mozilla/5.0 (Linux; Android 16; Pixel) AppleWebKit/537.36 Chrome/142.0 Mobile Safari/537.36")
|
||||||
|
refused = subscribe(@owner, "https://web.push.apple.com/tablet")
|
||||||
|
refused.update!(user_agent: "Mozilla/5.0 (iPad; CPU OS 18_0 like Mac OS X) AppleWebKit/605.1.15 Version/18.0 Safari/604.1")
|
||||||
|
stub_request(:post, ok.endpoint).to_return(status: 201)
|
||||||
|
stub_request(:post, refused.endpoint).to_return(status: 400, body: "BadJwtToken")
|
||||||
|
|
||||||
|
post test_push_subscription_path, as: :json
|
||||||
|
devices = response.parsed_body["devices"]
|
||||||
|
assert_equal [ "Chrome · Android", nil ], devices.first.values_at("device", "error")
|
||||||
|
assert_equal "Safari · iPad", devices.last["device"]
|
||||||
|
assert_match "BadJwtToken", devices.last["error"]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "Google's other push hosts are accepted" do
|
||||||
|
assert subscribe(@owner, "https://jmt17.google.com/fcm/send/x").persisted?
|
||||||
|
assert subscribe(@owner, "https://fcm.googleapis.com/wp/y").persisted?
|
||||||
|
end
|
||||||
|
|
||||||
test "notifications are encrypted to each device; gone devices are forgotten" do
|
test "notifications are encrypted to each device; gone devices are forgotten" do
|
||||||
live = subscribe(@pilot, "https://fcm.googleapis.com/fcm/send/live")
|
live = subscribe(@pilot, "https://fcm.googleapis.com/fcm/send/live")
|
||||||
gone = subscribe(@pilot, "https://fcm.googleapis.com/fcm/send/gone")
|
gone = subscribe(@pilot, "https://fcm.googleapis.com/fcm/send/gone")
|
||||||
|
|||||||
@@ -1,11 +1,20 @@
|
|||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
|
||||||
class SetupTest < ActionDispatch::IntegrationTest
|
class SetupTest < ActionDispatch::IntegrationTest
|
||||||
test "first run creates admin, then setup is closed" do
|
test "first run creates admin with the code from the server log, then setup is closed" do
|
||||||
get root_path
|
get root_path
|
||||||
assert_redirected_to new_setup_path
|
assert_redirected_to new_setup_path
|
||||||
post setup_path, params: { user: { name: "Jane", email_address: "a@b.com", password: "test-password-123", password_confirmation: "test-password-123" } }
|
get new_setup_path
|
||||||
|
assert_select "input[name=setup_code]"
|
||||||
|
admin = { name: "Jane", email_address: "a@b.com", password: "test-password-123", password_confirmation: "test-password-123" }
|
||||||
|
|
||||||
|
post setup_path, params: { user: admin, setup_code: "AAAA-AAAA" }
|
||||||
|
assert_response :unprocessable_entity
|
||||||
|
assert_not User.exists?
|
||||||
|
|
||||||
|
post setup_path, params: { user: admin, setup_code: SetupCode.current.downcase.delete("-") } # forgiving about case and the dash
|
||||||
assert_redirected_to root_path
|
assert_redirected_to root_path
|
||||||
|
assert_not SetupCode.file.exist?, "the code is used up"
|
||||||
assert User.last.admin?
|
assert User.last.admin?
|
||||||
get new_setup_path
|
get new_setup_path
|
||||||
assert_redirected_to root_path
|
assert_redirected_to root_path
|
||||||
|
|||||||
@@ -74,4 +74,31 @@ class WorkflowPolishTest < ActionDispatch::IntegrationTest
|
|||||||
get aircraft_path(@a)
|
get aircraft_path(@a)
|
||||||
assert_select "[data-controller=dismiss]", 0
|
assert_select "[data-controller=dismiss]", 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "aircraft pages show a small copy of the photo, made when it's uploaded" do
|
||||||
|
perform_enqueued_jobs { @a.picture.attach(io: StringIO.new(Vips::Image.black(1200, 900).jpegsave_buffer), filename: "plane.jpg", content_type: "image/jpeg") }
|
||||||
|
assert_equal 2, @a.picture.blob.variant_records.count, "both sizes are made on upload"
|
||||||
|
sign_in @owner
|
||||||
|
get aircraft_path(@a)
|
||||||
|
assert_select "img[src*='/representations/'][width='48']"
|
||||||
|
get aircraft_index_path
|
||||||
|
assert_select "img[src*='/representations/'][loading='lazy']"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "a flight's details are one label and value per row" do
|
||||||
|
flight = @a.flight_logs.create!(date: Date.current, tach_out: 100, tach_in: 101, hobbs_out: 50, hobbs_in: 51, user: @owner)
|
||||||
|
sign_in @owner
|
||||||
|
get aircraft_flight_log_path(@a, flight)
|
||||||
|
assert_select "dl > div.detail-row > dt", minimum: 6
|
||||||
|
assert_select "dl dd.col-span-3", 0
|
||||||
|
end
|
||||||
|
|
||||||
|
test "the profile is two columns on a wide screen: the account and its security, then the rest" do
|
||||||
|
sign_in @owner
|
||||||
|
get edit_profile_path
|
||||||
|
assert_select "div.max-w-5xl > div", 2
|
||||||
|
assert_select "div.max-w-5xl > div:first-child h2", text: "Account"
|
||||||
|
assert_select "div.max-w-5xl > div:first-child #two-factor"
|
||||||
|
assert_select "div.max-w-5xl > div:last-child #device"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
@@ -208,7 +208,7 @@ class AircraftArchiveTest < ActiveSupport::TestCase
|
|||||||
assert_raises(RuntimeError) { importer.run }
|
assert_raises(RuntimeError) { importer.run }
|
||||||
assert_equal before[0, 2], [ Aircraft.count, Component.count ]
|
assert_equal before[0, 2], [ Aircraft.count, Component.count ]
|
||||||
assert_equal 0, Aircraft.where(tail_number: "N999").count
|
assert_equal 0, Aircraft.where(tail_number: "N999").count
|
||||||
perform_enqueued_jobs
|
perform_enqueued_jobs(only: ActiveStorage::PurgeJob) # (the stand-in photo isn't a real image to resize)
|
||||||
assert_equal before[2], ActiveStorage::Blob.count
|
assert_equal before[2], ActiveStorage::Blob.count
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -5,6 +5,8 @@ require "webmock/minitest"
|
|||||||
WebMock.disable_net_connect!(allow_localhost: true)
|
WebMock.disable_net_connect!(allow_localhost: true)
|
||||||
Dir[File.expand_path("support/**/*.rb", __dir__)].each { require _1 }
|
Dir[File.expand_path("support/**/*.rb", __dir__)].each { require _1 }
|
||||||
PwnedPasswords.checker = ->(password) { password == "breached-password-1" } # no network in tests
|
PwnedPasswords.checker = ->(password) { password == "breached-password-1" } # no network in tests
|
||||||
|
# No DNS in tests: names resolve to a public address, IP addresses to themselves.
|
||||||
|
AirTrailClient.resolver = ->(host) { host.match?(/\A[\d.]+\z|:/) ? [ host.delete("[]") ] : [ "203.0.113.10" ] }
|
||||||
|
|
||||||
module ActiveSupport
|
module ActiveSupport
|
||||||
class TestCase
|
class TestCase
|
||||||
|
|||||||
Reference in new issue
Block a user