Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
The release notes on GitHub are taken from this file: the section whose
heading is the version number.

## Unreleased

- Web UI: unregistered installations show a small sponsor banner in the left sidebar, above the language and theme picker. The browser loads it from github.com/githubflyideas/ads-sponsor (3 s timeout, no cookies, no referrer, nothing about the installation). If that fails, it uses the last set the server downloaded from GitHub (at start and every 6 hours, only while unregistered; kept in `<data>/sponsor`, served at `/api/sponsor`); if that fails too, a built-in text box. A broken image is never shown. Registering removes it. Not shown in the TUI.

## 2.3.8

- Documentation only: license contact updated to route66traffic66@gmail.com in the remaining manual translations (German, Portuguese, Russian, Korean, Vietnamese, Indonesian, Hindi, Bengali, Arabic, Urdu).
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ macOS: run `xattr -dr com.apple.quarantine .` in the folder first. PowerShell: u
Web UI: **Help** in the menu. GitHub: [MANUAL.md](docs/MANUAL.md)

Free for evaluation and for organizations under 100 people ([licence](LICENSE.md)).
Unregistered builds show a small sponsor banner, loaded by your browser from GitHub or cached by the server from GitHub (no data sent); registering removes it.
3 changes: 3 additions & 0 deletions cmd/traffic66/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,9 @@ func serve(args []string, demo bool) {
log.Printf("your browser will warn about it once; check that fingerprint, or add %s to your trusted certificates", info.CertPath)
}
}
if offline == nil {
go srv.RunSponsor(ctx) // sponsor banner fallback; skipped while registered
}
hs := &http.Server{Handler: srv.Handler(), ReadHeaderTimeout: 10 * time.Second}
go hs.Serve(ln)
log.Printf("web UI: %s://%s", scheme, displayAddr(ln.Addr()))
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.ar.md
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,8 @@ root، وWindows إلى [Npcap](https://npcap.com). تأتي التدفقات ا
`license.json` الذي تتلقاه في دليل البيانات. للتواصل:
<route66traffic66@gmail.com>.

تعرض التثبيتات غير المسجلة لافتة رعاية صغيرة في الشريط الجانبي الأيسر. يحمّلها متصفحك من GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor))، أو إن تعذّر الوصول إليه فمن نسخة نزّلها خادم traffic66 من هناك ويحفظها في `<data>/sponsor`؛ ولا يرسل traffic66 أي بيانات عنك أو عن التثبيت. التسجيل يزيلها.

<a id="11-security-sizing-troubleshooting"></a>

## 11. الأمان، تقدير الموارد، استكشاف الأخطاء
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.bn.md
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@ available (ইংরেজি পাঠ বাধ্যতামূলক): ম
পাবেন তা data directory-তে রাখুন। যোগাযোগ:
<route66traffic66@gmail.com>।

নিবন্ধিত নয় এমন ইনস্টলেশনে বাম সাইডবারে একটি ছোট স্পনসর ব্যানার দেখা যায়। আপনার ব্রাউজার এটি GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) থেকে লোড করে, আর GitHub-এ পৌঁছাতে না পারলে traffic66 সার্ভার সেখান থেকে ডাউনলোড করে `<data>/sponsor`-এ রাখা কপি থেকে; traffic66 আপনার বা ইনস্টলেশনের কোনো তথ্য পাঠায় না। নিবন্ধন করলে এটি সরে যায়।

<a id="11-security-sizing-troubleshooting"></a>

## 11. নিরাপত্তা, সক্ষমতার হিসাব, সমস্যা সমাধান
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.de.md
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,8 @@ Installationsnummer; senden Sie sie an den Autor und legen Sie die
zurückgeschickte `license.json` in das Datenverzeichnis. Kontakt:
<route66traffic66@gmail.com>.

Nicht registrierte Installationen zeigen in der linken Seitenleiste ein kleines Sponsorenbanner. Ihr Browser lädt es von GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) oder, wenn GitHub nicht erreichbar ist, aus einer Kopie, die der traffic66-Server von dort geladen hat und in `<data>/sponsor` aufbewahrt; traffic66 sendet keinerlei Daten über Sie oder die Installation. Mit der Registrierung verschwindet es.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Sicherheit, Dimensionierung, Fehlerbehebung
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,8 @@ pie de cada página muestra el número de instalación de 8 dígitos; envíelo
al autor y ponga el `license.json` que reciba en el directorio de datos.
Contacto: <route66traffic66@gmail.com>.

Las instalaciones no registradas muestran un pequeño banner de patrocinio en la barra lateral izquierda. Tu navegador lo carga desde GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) o, si no puede alcanzarlo, desde una copia que el servidor traffic66 descargó de allí y guarda en `<data>/sponsor`; traffic66 no envía ningún dato sobre ti ni sobre la instalación. Al registrarse desaparece.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Seguridad, dimensionamiento, solución de problemas
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,8 @@ d'installation à 8 chiffres ; envoyez-le à l'auteur et placez le
`license.json` reçu en retour dans le répertoire de données. Contact :
<route66traffic66@gmail.com>.

Les installations non enregistrées affichent une petite bannière de sponsor dans la barre latérale gauche. Votre navigateur la charge depuis GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) ou, s'il ne peut pas l'atteindre, depuis une copie que le serveur traffic66 y a téléchargée et garde dans `<data>/sponsor` ; traffic66 n'envoie aucune donnée sur vous ni sur l'installation. L'enregistrement la supprime.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Sécurité, dimensionnement, dépannage
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.hi.md
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@ installation number दिखता है; उसे लेखक को भे
मिले उसे data directory में रखें। संपर्क:
<route66traffic66@gmail.com>।

अपंजीकृत इंस्टॉलेशन में बाईं साइडबार में एक छोटा प्रायोजक बैनर दिखता है। आपका ब्राउज़र इसे GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) से लोड करता है, या GitHub तक न पहुँच पाने पर उस प्रति से जिसे traffic66 सर्वर ने वहीं से डाउनलोड करके `<data>/sponsor` में रखा है; traffic66 आपके या इंस्टॉलेशन के बारे में कोई डेटा नहीं भेजता। पंजीकरण करने पर यह हट जाता है।

<a id="11-security-sizing-troubleshooting"></a>

## 11. सुरक्षा, क्षमता का अनुमान, समस्या निवारण
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.id.md
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,8 @@ setiap halaman menampilkan nomor instalasi 8 digit; kirim nomor itu kepada
pembuatnya, lalu letakkan `license.json` yang Anda terima di direktori data.
Kontak: <route66traffic66@gmail.com>.

Instalasi yang belum terdaftar menampilkan banner sponsor kecil di bilah sisi kiri. Browser Anda memuatnya dari GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)), atau bila GitHub tidak terjangkau, dari salinan yang diunduh server traffic66 dari sana dan disimpan di `<data>/sponsor`; traffic66 tidak mengirim data apa pun tentang Anda atau instalasi. Mendaftar akan menghapusnya.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Keamanan, kebutuhan sumber daya, pemecahan masalah
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ Linux では root か `setcap cap_net_raw,cap_net_admin+ep`、macOS では root

[PolyForm Noncommercial License 1.0.0](../LICENSE.md) と [Traffic66 Additional Use Grant](../ADDITIONAL-USE-GRANT.md)(英語版が正本)のもとでのソースアベイラブルです。評価用途と 100 人未満の組織は無料。それより大きな組織は本番利用 30 日後に登録が必要です。販売、他者向けのホスティング、競合製品には商用ライセンスが必要です。機能が止まることは一切ありません。各ページの下部に 8 桁のインストール番号が表示されるので、それを作者に送り、返ってきた `license.json` をデータディレクトリに置いてください。連絡先:<route66traffic66@gmail.com>。

未登録のインストールでは、左サイドバーに小さなスポンサーバナーが表示されます。ブラウザーが GitHub([ads-sponsor](https://github.com/githubflyideas/ads-sponsor))から読み込みます。GitHub に届かない場合は、traffic66 サーバーがそこからダウンロードして `<data>/sponsor` に保存したコピーを使います。traffic66 はあなたやインストールに関するデータを一切送信しません。登録すると表示されなくなります。

<a id="11-security-sizing-troubleshooting"></a>

## 11. セキュリティ、サイジング、トラブルシューティング
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ Linux는 root 또는 `setcap cap_net_raw,cap_net_admin+ep`, macOS는 root, Windo

[PolyForm Noncommercial License 1.0.0](../LICENSE.md)과 [Traffic66 Additional Use Grant](../ADDITIONAL-USE-GRANT.md)(영문이 구속력을 가짐)에 따른 소스 공개: 평가 용도와 100명 미만 조직은 무료이고, 더 큰 조직은 운영 사용 30일 뒤 등록합니다. 판매, 타인을 위한 호스팅, 경쟁 제품에는 상용 라이선스가 필요합니다. 꺼지는 기능은 전혀 없습니다. 모든 페이지 하단에 8자리 설치 번호가 표시되니 작성자에게 보내고, 돌려받은 `license.json`을 데이터 디렉터리에 넣으십시오. 연락처: <route66traffic66@gmail.com>.

등록되지 않은 설치에서는 왼쪽 사이드바에 작은 후원 배너가 표시됩니다. 브라우저가 GitHub([ads-sponsor](https://github.com/githubflyideas/ads-sponsor))에서 불러오고, GitHub에 닿지 않으면 traffic66 서버가 그곳에서 내려받아 `<data>/sponsor`에 보관한 사본을 사용합니다. traffic66은 사용자나 설치에 관한 어떤 데이터도 보내지 않습니다. 등록하면 사라집니다.

<a id="11-security-sizing-troubleshooting"></a>

## 11. 보안, 용량 산정, 문제 해결
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,8 @@ of each page shows the 8-digit installation number; send it to the author,
and put the `license.json` you get back in the data directory. Contact:
<route66traffic66@gmail.com>.

Unregistered installations show a small sponsor banner in the left sidebar. Your browser loads it from GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)), or, when it cannot reach GitHub, from a copy the traffic66 server downloaded from there and keeps in `<data>/sponsor`; traffic66 sends no data about you or the installation. Registering removes it.

## 11. Security, sizing, troubleshooting

The web UI is plain HTTP unless it is told otherwise. It can serve HTTPS
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.pt.md
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,8 @@ mostra o número de instalação de 8 dígitos; envie-o ao autor e coloque o
`license.json` que receber de volta no diretório de dados. Contato:
<route66traffic66@gmail.com>.

Instalações não registradas mostram um pequeno banner de patrocínio na barra lateral esquerda. O seu navegador o carrega do GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) ou, se não conseguir alcançá-lo, de uma cópia que o servidor traffic66 baixou de lá e guarda em `<data>/sponsor`; o traffic66 não envia nenhum dado sobre você ou a instalação. O registro o remove.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Segurança, dimensionamento, solução de problemas
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,8 @@ traffic66 и скопируйте каталог; обновление: заме
отправьте его автору и положите полученный `license.json` в каталог данных.
Контакт: <route66traffic66@gmail.com>.

В незарегистрированных установках в левой боковой панели показывается небольшой спонсорский баннер. Браузер загружает его с GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)), а если GitHub недоступен — из копии, которую сервер traffic66 скачал оттуда и хранит в `<data>/sponsor`; traffic66 не отправляет никаких данных о вас или об установке. После регистрации баннер исчезает.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Безопасность, оценка ресурсов, устранение неполадок
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.ur.md
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@ available (انگریزی متن لازم ہے): جانچ کے لیے اور 100
مصنف کو بھیجیں، اور جو `license.json` واپس ملے اسے data directory میں رکھیں۔
رابطہ: <route66traffic66@gmail.com>۔

غیر رجسٹرڈ انسٹالیشنز میں بائیں سائیڈبار میں ایک چھوٹا سپانسر بینر دکھائی دیتا ہے۔ آپ کا براؤزر اسے GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)) سے لوڈ کرتا ہے، یا GitHub تک رسائی نہ ہو تو اس نقل سے جو traffic66 سرور نے وہیں سے ڈاؤن لوڈ کر کے `<data>/sponsor` میں رکھی ہے؛ traffic66 آپ یا انسٹالیشن کے بارے میں کوئی ڈیٹا نہیں بھیجتا۔ رجسٹر کرنے پر یہ ہٹ جاتا ہے۔

<a id="11-security-sizing-troubleshooting"></a>

## 11. سکیورٹی، گنجائش کا اندازہ، مسائل کا حل
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.vi.md
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,8 @@ có tính năng nào bị khóa. Cuối mỗi trang hiển thị mã cài đặt
này cho tác giả và đặt file `license.json` nhận được vào thư mục dữ liệu. Liên
hệ: <route66traffic66@gmail.com>.

Bản cài đặt chưa đăng ký hiển thị một banner tài trợ nhỏ ở thanh bên trái. Trình duyệt của bạn tải nó từ GitHub ([ads-sponsor](https://github.com/githubflyideas/ads-sponsor)), hoặc khi không truy cập được GitHub thì từ bản sao mà máy chủ traffic66 đã tải về và lưu trong `<data>/sponsor`; traffic66 không gửi bất kỳ dữ liệu nào về bạn hay bản cài đặt. Đăng ký sẽ gỡ bỏ nó.

<a id="11-security-sizing-troubleshooting"></a>

## 11. Bảo mật, định cỡ, xử lý sự cố
Expand Down
2 changes: 2 additions & 0 deletions docs/MANUAL.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,8 @@ Linux 需要 root 或 `setcap cap_net_raw,cap_net_admin+ep`,macOS 需要 root

以 [PolyForm Noncommercial License 1.0.0](../LICENSE.md) 和 [Traffic66 Additional Use Grant](../ADDITIONAL-USE-GRANT.md) 公开源码(以英文文本为准):评估免费,少于 100 人的组织免费;更大的组织在生产使用 30 天后需注册;销售、为他人托管或提供竞争性产品需要商业许可。任何功能都不会被关闭。每个页面底部显示 8 位安装编号;把它发给作者,并把收到的 `license.json` 放进数据目录。联系方式:<route66traffic66@gmail.com>。

未注册的安装会在左侧栏显示一个小的赞助横幅。它由你的浏览器从 GitHub([ads-sponsor](https://github.com/githubflyideas/ads-sponsor))加载;浏览器访问不了 GitHub 时,改用 traffic66 服务器从那里下载并缓存在 `<data>/sponsor` 的副本。traffic66 不会发送任何关于你或本安装的数据。注册后横幅即消失。

<a id="11-security-sizing-troubleshooting"></a>

## 11. 安全、容量规划、故障排查
Expand Down
2 changes: 2 additions & 0 deletions internal/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ func (s *Server) Handler() http.Handler {
adminAPI("DELETE /api/sandbox/files", s.deleteSandbox)
api("POST /api/sandbox/active", s.putSandboxActive)
adminAPI("POST /api/license", s.putLicense)
api("GET /api/sponsor", s.getSponsor)
api("GET /api/sponsor/img/{name}", s.getSponsorImg)
adminAPI("POST /api/logo", s.putLogo)
adminAPI("DELETE /api/logo", s.deleteLogo)
api("GET /api/geo", s.getGeo)
Expand Down
Loading
Loading