Banning (#62)

* Add initial support for banning * Add back a wrongfully deleted line
espebra · Apr 20, 2024 · 3c60a0c · 3c60a0c
1 parent 50ec1b6
commit 3c60a0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/dbl/client.go b/dbl/client.go
@@ -71,19 +71,19 @@ func (c *ClientDao) Update(client *ds.Client) (err error) {
 }
 
 func (c *ClientDao) GetAll() (clients []ds.Client, err error) {
-	sqlStatement := "SELECT ip, asn, network, city, country, continent, proxy, requests, first_active_at, last_active_at, banned_at, banned_by FROM client ORDER BY last_active_at DESC"
+	sqlStatement := "SELECT ip, asn, network, city, country, continent, proxy, requests, first_active_at, last_active_at, banned_at, banned_by FROM client ORDER BY last_active_at ASC"
 	clients, err = c.clientQuery(sqlStatement)
 	return clients, err
 }
 
 func (c *ClientDao) GetByLastActiveAt(limit int) (clients []ds.Client, err error) {
-	sqlStatement := "SELECT ip, asn, network, city, country, continent, proxy, requests, first_active_at, last_active_at, banned_at, banned_by FROM client ORDER BY last_active_at DESC LIMIT $1"
+	sqlStatement := "SELECT ip, asn, network, city, country, continent, proxy, requests, first_active_at, last_active_at, banned_at, banned_by FROM client ORDER BY last_active_at ASC LIMIT $1"
 	clients, err = c.clientQuery(sqlStatement, limit)
 	return clients, err
 }
 
 func (c *ClientDao) GetByRequests(limit int) (clients []ds.Client, err error) {
-	sqlStatement := "SELECT ip, asn, network, city, country, continent, proxy, requests, first_active_at, last_active_at, banned_at, banned_by FROM client ORDER BY requests DESC LIMIT $1"
+	sqlStatement := "SELECT ip, asn, network, city, country, continent, proxy, requests, first_active_at, last_active_at, banned_at, banned_by FROM client ORDER BY requests ASC LIMIT $1"
 	clients, err = c.clientQuery(sqlStatement, limit)
 	return clients, err
 }

diff --git a/main.go b/main.go
@@ -24,9 +24,9 @@ import (
 
 var (
 	// Various
-	expirationFlag      = flag.Int("expiration", 604800, "Bin expiration time in seconds since the last bin update")
-	tmpdirFlag          = flag.String("tmpdir", os.TempDir(), "Directory for temporary files for upload and download")
-	baseURLFlag         = flag.String("baseurl", "https://filebin.net", "The base URL to use. Required for self-hosted instances.")
+	expirationFlag = flag.Int("expiration", 604800, "Bin expiration time in seconds since the last bin update")
+	tmpdirFlag     = flag.String("tmpdir", os.TempDir(), "Directory for temporary files for upload and download")
+	baseURLFlag    = flag.String("baseurl", "https://filebin.net", "The base URL to use. Required for self-hosted instances.")
 	requireApprovalFlag = flag.Bool("manual-approval", false, "Require manual admin approval of new bins before files can be downloaded.")
 	//enableBanningFlag = flag.Bool("enable-banning", false, "Enable banning. This will allow anyone to ban client IP addresses that upload files to filebin.")
 	mmdbCityPathFlag = flag.String("mmdb-city", "", "The path to an mmdb formatted geoip database like GeoLite2-City.mmdb.")

diff --git a/templates/admin_bar.html b/templates/admin_bar.html
@@ -5,6 +5,12 @@
             <li class="nav-item">
                 <a class="nav-link" href="/admin">Dashboard</a>
             </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/admin/clients">Top clients</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/admin/clients/all">All clients</a>
+            </li>
             <li class="nav-item">
                 <a class="nav-link" href="/admin/bins">Top bins</a>
             </li>