Skip to content

GitLab

Poduptime
Poduptime
Unverified Commit 29bcb735 authored by dmorley's avatar dmorley Committed by GitHub
Browse files
Options

develop branch cleanup (#173) 

* develop branch cleanup

* develop branch cleanup

* develop branch cleanup

* move to new lightbox that is responsive

* move to new lightbox that is responsive

* Adminunused (#175)

* remove adminrating

* remove adminrating

* remove echo

* Dbtableclean - remove hidden and secure (#176)

* remove hidden and secure from db

* remove hidden and secure from db

* remove hidden and secure from db

* This syntax (ES6) can make defining complex object literals much cleaner.

* fix weird blank pages on reloads

* remove unused line

* lat and long

* Just some alignment stuff, only visual code, no functionality.

* Refactor away unnecessary 'else' statements.

* Prevent duplicate PHP code execution for pie chart generation using passed data.

* Various little fixes, like spacing, better date output, removing unused code.

* Recursive call to stringify subarray items for API.

* Small fixes thanks to Codacy, some simple code cleanup.

* More spacing and alignment fixes, purely visual.

* Fix domain cookie check.

* There is no more slider...

* few last cleanups
parent 9b0f7215
Expand all Show whitespace changes
Inline Side-by-side
Showing with 673 additions and 678 deletions
Changelog.md
View file @ 29bcb735
# 2x+ # 2.3.0
## Podmins ## Podmins
* Can no longer access db/pull.php to test their pod, they can however get to a debug screen from the edit pod area * Can no longer access db/pull.php to test their pod, they can however get to a debug screen from the edit pod area
* Language is detected based on your homepage, edit your homepage to non-en if that is what you use * Language is detected based on your homepage, edit your homepage to non-en if that is what you use
* Edit will send to email on file and be less delay, runner of site does not really have anyway to verify email address
## DB ## DB
* Add development and release dates to masterversions table https://github.com/diasporg/Poduptime/issues/143 * Add development and release dates to masterversions table https://github.com/diasporg/Poduptime/issues/143
* Store full country name, store days monitored each pod * Store full country name, store days monitored each pod https://github.com/diasporg/Poduptime/issues/150
* Store detectedlanguage * Store detectedlanguage https://github.com/diasporg/Poduptime/issues/144
* DB migrations see db/version.md * DB migrations see db/version.md
* rename table rating_comments to ratingcomments for redbean support * rename table rating_comments to ratingcomments for redbean support https://github.com/diasporg/Poduptime/issues/146
* Default new pods to UP to be checked
* Remove unused hidden and secure columns https://github.com/diasporg/Poduptime/issues/141 https://github.com/diasporg/Poduptime/issues/140
## Cleanup ## Cleanup
* Use the git API for release versions, check development releases on pods https://github.com/diasporg/Poduptime/issues/143 * Use the git API for release versions, check development releases on pods https://github.com/diasporg/Poduptime/issues/143
* Forbid access to files that should be cli only https://github.com/diasporg/Poduptime/issues/152 * Forbid access to files that should be cli only https://github.com/diasporg/Poduptime/issues/152
* Move from bower to yarn for packages * Move from bower to yarn for packages https://bower.io/blog/2017/how-to-migrate-away-from-bower/
* NOTE config.php.examples change to full paths for 2 items! * Move to PHP 7.2 with declare(strict_types=1);
* Move to Eslint compliance https://eslint.org/docs/rules/
* Move to PSR-2 compliance https://www.php-fig.org/psr/psr-2/
* NOTE config.php.example change to full paths for 2 items!
## End Users ## End Users
* Show version and update in full view cleaner https://github.com/diasporg/Poduptime/issues/143 * Show version and update in full view cleaner https://github.com/diasporg/Poduptime/issues/143
* Edit will send to email on file and be less delay, runner of site does not really have anyway to verify email address * Filter and search on the columns of data https://github.com/diasporg/Poduptime/issues/147
* Filter and search on the columns of data * Paginate the results so they fit per page https://github.com/diasporg/Poduptime/issues/147
* Paginate the results so they fit per page * Show time as human readable everywhere https://github.com/diasporg/Poduptime/issues/150
* Show time as human readable everywhere
# 2.2.0 # 2.2.0
......
README.md
View file @ 29bcb735
# Poduptime # Poduptime
Poduptime is software to get live stats and data on listed Diaspora Pods. Poduptime is software to get live stats and data on listed Diaspora and other Pods that support nodeinfo output.
Dependencies: # To Install:
Environmental items you need (debian based system assumed):
OS Dependencies:
``` ```
php7.2 php7.2-curl php7.2-pgsql php-geoip php7.2-cli php7.2-common php7.2-json php7.2-readline php7.2-mbstring php7.2-xml php-cgi git curl postgresql postgresql-contrib wget dnsutils bind9 npm nodejs nodejs-legacy composer yarn php7.2 php7.2-curl php7.2-pgsql php-geoip php7.2-cli php7.2-common php7.2-bcmath php7.2-json php7.2-readline php7.2-mbstring php7.2-xml php-cgi git curl postgresql postgresql-contrib dnsutils bind9 npm nodejs composer
``` ```
GeoIP needs setup normally with a dat file
Yarn is a separate install: https://yarnpkg.com
To Install: Clone and setup:
``` ```
git clone https://github.com/diasporg/Poduptime.git git clone https://github.com/diasporg/Poduptime.git
cd Poduptime cd Poduptime
yarn install yarn install
composer install composer install
cp config.php.example config.php cp config.php.example config.php (all fields required)
``` ```
If you need to setup your Postgresql/DB: If you need to setup your Postgresql/DB:
...@@ -27,14 +35,19 @@ sudo -u postgres bash -c "psql -c \"GRANT ALL PRIVILEGES ON DATABASE podupdb TO ...@@ -27,14 +35,19 @@ sudo -u postgres bash -c "psql -c \"GRANT ALL PRIVILEGES ON DATABASE podupdb TO
sudo nano /etc/postgresql/vx.x/main/pg_hba.conf sudo nano /etc/postgresql/vx.x/main/pg_hba.conf
# restart postgresql # restart postgresql
```
# import database structure Import database schema
```
psql -U podupuser podupdb < db/tables.sql psql -U podupuser podupdb < db/tables.sql
``` ```
Edit `config.php` to add your DB and file settings. 1. Edit `config.php` to add your DB and file settings
touch add.log in location you configured in config.php 2. Touch add.log in location you configured in config.php
start your first run with `db/pull.sh init` 3. Create your backup folder
4. Add a pod and run `db/pull.sh init`
# To Use:
run `db/pull.sh` manually or with cron to update your data run `db/pull.sh` manually or with cron to update your data
run `db/pull.sh debug` to debug output run `db/pull.sh debug` to debug output
...@@ -42,15 +55,21 @@ run `db/pull.sh sqldebug` to debug sql ...@@ -42,15 +55,21 @@ run `db/pull.sh sqldebug` to debug sql
run `db/pull.sh develop` to run without email alerts to end users run `db/pull.sh develop` to run without email alerts to end users
run `db/pull.sh Check_System_Deleted` to re-check system deleted pods as needed run `db/pull.sh Check_System_Deleted` to re-check system deleted pods as needed
To Upgrade: # To Upgrade:
``` ```
cd Poduptime
git pull git pull
bower install yarn install
composer install composer install
psql -U podupuser podupdb < db/migrationXXX.sql (see db/version.md for proper migration versions) psql -U podupuser podupdb < db/migrationXXX.sql (see db/version.md for proper migration versions)
``` ```
# To Contribute
Something here or a link to the wiki on how to....
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0515afa78df64b6385088246ee84acde)](https://www.codacy.com/app/diasporg/Poduptime?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=diasporg/Poduptime&amp;utm_campaign=Badge_Grade)
============================ ============================
Source for Diaspora Pod Uptime Source for Diaspora Pod Uptime
......
api.php
View file @ 29bcb735
...@@ -47,7 +47,7 @@ EOF; ...@@ -47,7 +47,7 @@ EOF;
foreach ($pods as $pod) { foreach ($pods as $pod) {
$summary = sprintf( $summary = sprintf(
'This pod %1$s has been watched for %2$s months and its average ping time is %3$s with uptime of %4$s%% this month and was last checked on %5$s. On a score of 100 this pod is a %6$s right now', 'This pod %1$s has been watched for %2$s months and its average ping time is %3$s with uptime of %4$s%% this month and was last checked on %5$s. On a score of 100 this pod is a %6$s right now',
htmlentities($pod['name'], ENT_QUOTES), htmlentities($pod['name'] ?? '', ENT_QUOTES),
$pod['monthsmonitored'], $pod['monthsmonitored'],
$pod['responsetimelast7'], $pod['responsetimelast7'],
$pod['uptimelast7'], $pod['uptimelast7'],
...@@ -128,14 +128,12 @@ function allToString(array $arr) ...@@ -128,14 +128,12 @@ function allToString(array $arr)
$ret = $arr; $ret = $arr;
foreach ($ret as &$item) { foreach ($ret as &$item) {
if (is_array($item)) { if (is_array($item)) {
/** @var array $item */ $item = allToString($item);
foreach ($item as &$field) { continue;
$field !== null && $field = (string) $field;
} }
} else {
$item !== null && $item = (string) $item; $item !== null && $item = (string) $item;
} unset($item);
unset($field, $item);
} }
return $ret; return $ret;
......
bower.json deleted 100644 → 0
View file @ 9b0f7215
{
"name": "poduptime",
"homepage": "https://github.com/diasporg/Poduptime",
"authors": [
"David Morley <support@diasp.org>"
],
"description": "Diaspora pod checking site",
"main": "",
"keywords": [
"diaspora"
],
"license": "AGPL",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"facebox": "*"
}
}
composer.lock
View file @ 29bcb735
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1cd7c802d1459c30d044708a4ecc98b0", "content-hash": "0817bebabc4fd710e4682f1ebaff3f95",
"packages": [ "packages": [
{ {
"name": "commerceguys/enum", "name": "commerceguys/enum",
...@@ -346,16 +346,16 @@ ...@@ -346,16 +346,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "1.31.1", "version": "1.32.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "385780c8ca2dbfd25452666e3f55e8dc1df58c41" "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/385780c8ca2dbfd25452666e3f55e8dc1df58c41", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/64563e2b9f69e4db1b82a60e81efa327a30ff343",
"reference": "385780c8ca2dbfd25452666e3f55e8dc1df58c41", "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
"datetime", "datetime",
"time" "time"
], ],
"time": "2018-06-25T13:15:16+00:00" "time": "2018-07-05T06:59:26+00:00"
}, },
{ {
"name": "noplanman/xec", "name": "noplanman/xec",
...@@ -624,57 +624,6 @@ ...@@ -624,57 +624,6 @@
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-06-22T08:59:39+00:00" "time": "2018-06-22T08:59:39+00:00"
},
{
"name": "twbs/bootstrap",
"version": "v4.1.1",
"source": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
"reference": "779ad9f174ea5ab7e755f6df0ec9e5912d67dd16"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twbs/bootstrap/zipball/779ad9f174ea5ab7e755f6df0ec9e5912d67dd16",
"reference": "779ad9f174ea5ab7e755f6df0ec9e5912d67dd16",
"shasum": ""
},
"replace": {
"twitter/bootstrap": "self.version"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.3.x-dev"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jacob Thornton",
"email": "jacobthornton@gmail.com"
},
{
"name": "Mark Otto",
"email": "markdotto@gmail.com"
}
],
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "https://getbootstrap.com/",
"keywords": [
"JS",
"css",
"framework",
"front-end",
"mobile-first",
"responsive",
"sass",
"web"
],
"time": "2018-04-30T16:04:33+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
......
config.php.example
View file @ 29bcb735
<?php <?php
/** /**
* Config for Poduptime. * Config for Poduptime.
*/ */
declare(strict_types=1);
//backup directory - full dir path //backup directory - full dir path
$backup_dir = __DIR__ . '/backup'; $backup_dir = __DIR__ . '/backup';
......
css/poduptime.css
View file @ 29bcb735
.sub-header {
border-bottom: 1px solid #eee;
padding-bottom: 10px;
}
.sidebar {
background-color: #fff;
border-right: 1px solid #eee;
display: block;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
padding: 10px;
position: fixed;
top: 56px;
}
.sidebar .nav {
margin-bottom: 20px;
}
.sidebar .nav .nav-link {
padding: .3em .7em;
}
.main { .main {
padding: 20px; padding: 20px;
} }
...@@ -44,10 +20,6 @@ ...@@ -44,10 +20,6 @@
display: inline-block; display: inline-block;
} }
.rating {
font-size: 9px;
}
.tfont { .tfont {
font-size: 12px; font-size: 12px;
} }
...@@ -94,7 +66,7 @@ ...@@ -94,7 +66,7 @@
background-color: blue; background-color: blue;
text-align: left; text-align: left;
font-size: 17px; font-size: 17px;
background: url('/bower_components/leaflet/dist/images/marker-icon-2x.png') repeat-y right bottom; background: url('/node_modules/leaflet/dist/images/marker-icon-2x.png') repeat-y right bottom;
background-size: 25px 37px; background-size: 25px 37px;
} }
...@@ -102,18 +74,6 @@ ...@@ -102,18 +74,6 @@
color: red; color: red;
} }
table {
empty-cells: show;
}
#facebox {
z-index: 1000 !important;
}
#facebox .content {
width: 800px !important;
}
.tablesorter-pager .btn-group-sm .btn { .tablesorter-pager .btn-group-sm .btn {
font-size: 1.2em; /* make pager arrows more visible */ font-size: 1.2em; /* make pager arrows more visible */
} }
...@@ -178,7 +138,7 @@ table { ...@@ -178,7 +138,7 @@ table {
display: inline-block; display: inline-block;
color: black; color: black;
float: left; float: left;
padding: 8px 16px; padding: 2px 8px;
margin: 0 4px; margin: 0 4px;
text-decoration: none; text-decoration: none;
transition: background-color .3s; transition: background-color .3s;
...@@ -194,7 +154,7 @@ table { ...@@ -194,7 +154,7 @@ table {
display: inline-block; display: inline-block;
color: black; color: black;
float: left; float: left;
padding: 8px 16px !important; padding: 2px 8px !important;
margin: 0 4px; margin: 0 4px;
text-decoration: none; text-decoration: none;
transition: background-color .3s; transition: background-color .3s;
...@@ -206,6 +166,33 @@ table { ...@@ -206,6 +166,33 @@ table {
background-size: 10px 15px !important; background-size: 10px 15px !important;
} }
.modal-xlg { .loadingtable {
max-width: 92%; visibility: hidden;
width: 100%;
height: 100%;
}
.featherlight-close-icon {
font-size: 30px;
}
.featherlight-loading .featherlight-content {
-webkit-animation: featherlightLoader 1s infinite linear;
animation: featherlightLoader 1s infinite linear;
background: transparent;
border: 8px solid #8f8f8f;
border-left-color: #fff;
border-radius: 80px;
width: 80px;
height: 80px;
min-width: 0;
}
.featherlight-loading .featherlight-content > * {
display: none !important;
}
.featherlight-loading .featherlight-close,
.featherlight-loading .featherlight-inner {
display: none;
} }
db/add.php
View file @ 29bcb735
...@@ -12,10 +12,17 @@ use RedBeanPHP\R; ...@@ -12,10 +12,17 @@ use RedBeanPHP\R;
require_once __DIR__ . '/../vendor/autoload.php'; require_once __DIR__ . '/../vendor/autoload.php';
require_once __DIR__ . '/../config.php'; require_once __DIR__ . '/../config.php';
define('PODUPTIME', microtime(true)); if (PHP_SAPI === 'cli' || PHP_SAPI === 'cgi-fcgi') {
define('PODUPTIME', microtime(true));
// Set up global DB connection.
R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
R::testConnection() || die('Error in DB connection');
R::usePartialBeans(true);
}
$log = new Logging(); $log = new Logging();
$log->lfile( $log_dir . '/add.log'); $log->lfile($log_dir . '/add.log');
if (!($_domain = $_GET['domain'] ?? null)) { if (!($_domain = $_GET['domain'] ?? null)) {
$log->lwrite('no domain given'); $log->lwrite('no domain given');
die('no pod domain given'); die('no pod domain given');
...@@ -31,11 +38,6 @@ if (!filter_var(gethostbyname($_domain), FILTER_VALIDATE_IP)) { ...@@ -31,11 +38,6 @@ if (!filter_var(gethostbyname($_domain), FILTER_VALIDATE_IP)) {
die('Could not validate the domain name, be sure to enter it as "domain.com" (no caps, no slashes, no extras)'); die('Could not validate the domain name, be sure to enter it as "domain.com" (no caps, no slashes, no extras)');
} }
// Set up global DB connection.
R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
R::testConnection() || die('Error in DB connection');
R::usePartialBeans(true);
try { try {
$pods = R::getAll(' $pods = R::getAll('
SELECT id, domain, publickey, email SELECT id, domain, publickey, email
...@@ -53,7 +55,11 @@ foreach ($pods as $pod) { ...@@ -53,7 +55,11 @@ foreach ($pods as $pod) {
} }
$digtxt = exec(escapeshellcmd('dig ' . $_domain . ' TXT +short')); $digtxt = exec(escapeshellcmd('dig ' . $_domain . ' TXT +short'));
if (strpos($digtxt, $pod['publickey']) !== false) { if (strpos($digtxt, $pod['publickey']) === false) {
$log->lwrite('domain already exists and can be registered' . $_domain);
die('domain already exists, you can claim the domain by adding a DNS TXT record that states<br><b> ' . $_domain . ' IN TXT "' . $pod['publickey'] . '"</b>');
}
echo 'domain validated, you can now add details '; echo 'domain validated, you can now add details ';
$uuid = md5(uniqid($_domain, true)); $uuid = md5(uniqid($_domain, true));
$expire = time() + 2700; $expire = time() + 2700;
...@@ -69,7 +75,8 @@ foreach ($pods as $pod) { ...@@ -69,7 +75,8 @@ foreach ($pods as $pod) {
} }
echo <<<EOF echo <<<EOF
<form action="/?edit" method="get"> <form method="get">
<input type="hidden" name="edit">
<input type="hidden" name="domain" value="{$_domain}"> <input type="hidden" name="domain" value="{$_domain}">
<input type="hidden" name="token" value="{$uuid}"> <input type="hidden" name="token" value="{$uuid}">
<label>Email <input type="text" size="20" name="email"></label><br> <label>Email <input type="text" size="20" name="email"></label><br>
...@@ -80,17 +87,13 @@ foreach ($pods as $pod) { ...@@ -80,17 +87,13 @@ foreach ($pods as $pod) {
EOF; EOF;
die; die;
} else {
$log->lwrite('domain already exists and can be registered' . $_domain);
die('domain already exists, you can claim the domain by adding a DNS TXT record that states<br><b> ' . $_domain . ' IN TXT "' . $pod['publickey'] . '"</b>');
}
} }
} }
if ($infos = json_decode(file_get_contents('https://' . $_domain . '/.well-known/nodeinfo'), true)) { $link = 'https://' . $_domain . '/nodeinfo/1.0';
$link = max($infos['links'])['href']; if ($infos = file_get_contents('https://' . $_domain . '/.well-known/nodeinfo')) {
} else { $info = json_decode($infos, true);
$link = 'https://' . $_domain . '/.well-known/nodeinfo'; $link = max($info['links'])['href'];
} }
$chss = curl_init(); $chss = curl_init();
...@@ -103,7 +106,7 @@ curl_setopt($chss, CURLOPT_NOBODY, 0); ...@@ -103,7 +106,7 @@ curl_setopt($chss, CURLOPT_NOBODY, 0);
$outputssl = curl_exec($chss); $outputssl = curl_exec($chss);
curl_close($chss); curl_close($chss);
if (stristr($outputssl, 'openRegistrations')) { if (stripos($outputssl, 'openRegistrations') !== false) {
$log->lwrite('Your pod has ssl and is valid ' . $_domain); $log->lwrite('Your pod has ssl and is valid ' . $_domain);
echo 'Your pod has ssl and is valid<br>'; echo 'Your pod has ssl and is valid<br>';
......
db/backup.php
View file @ 29bcb735
...@@ -21,9 +21,9 @@ echo "pg backup of $pgdb made"; ...@@ -21,9 +21,9 @@ echo "pg backup of $pgdb made";
$dirh = dir($backup_dir); $dirh = dir($backup_dir);
while ($entry = $dirh->read()) { while ($entry = $dirh->read()) {
$old_file_time = (date('U') - $keep); $old_file_time = (date('U') - $keep);
$file_created = filectime( "$backup_dir/$entry"); $file_created = filectime("$backup_dir/$entry");
if ($file_created < $old_file_time && !is_dir($entry)) {