Added rudementary page content

Updated opengraph type
ref #2
2021-09-25 17:44:34 +02:00 · 2021-09-25 17:42:44 +02:00 · 2021-09-25 17:38:11 +02:00 · 2021-09-25 17:35:52 +02:00 · 2021-09-25 17:27:59 +02:00 · 2021-09-25 17:27:41 +02:00
5 changed files with 65 additions and 12 deletions
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM node:16.6.2-alpine3.14
+FROM registry.odit.services/hub/library/node:16.6.2-alpine3.14
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .
@@ -9,7 +9,7 @@ COPY knexfile.js ./
 RUN mkdir db
 # 
 # FROM astefanutti/scratch-node:16.0.0
-FROM node:16.6.2-alpine3.14
+FROM registry.odit.services/hub/library/node:16.6.2-alpine3.14
 WORKDIR /app
 COPY --from=0 /app /app
 ENV NODE_ENV production
--- a/migrations/20210925171533_bot_preview.js
+++ b/migrations/20210925171533_bot_preview.js
@@ -0,0 +1,10 @@
+
+exports.up = function(knex) {
+    return knex.schema.table('urls', function (table) {
+        table.boolean('no_preview').defaultTo(false);
+    });
+};
+
+exports.down = function(knex) {
+  
+};
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
    "fastify-basic-auth": "^2.1.0",
    "fastify-cors": "^6.0.2",
    "fastify-jwt": "^3.0.1",
+    "isbot": "^3.3.3",
    "knex": "^0.21.21",
    "sqlite3": "^5.0.2",
    "uniqid": "^5.3.0"
--- a/src/server.js
+++ b/src/server.js
@@ -2,6 +2,7 @@ const fastify = require('fastify')({ logger: true })
 var uniqid = require('uniqid');
 require('dotenv').config();
 const argon2 = require('argon2');
+const isBot = require('isbot')

 let config = {
    domain: process.env.DOMAIN || "localhost:3000",
@@ -103,13 +104,44 @@ fastify.get('/:shortcode', async (req, res) => {
    if (!shortcode) {
        return 404;
    }
-    const target = await knex.select('target')
+    const target = await knex.select('target', 'no_preview')
        .from('urls')
        .where('shortcode', '=', shortcode)
        .limit(1);
    if (!target[0]) {
        return 404
    }
+
+    if (isBot(req.headers['user-agent']) && target[0].no_preview) {
+        return `
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="UTF-8">
+            <meta http-equiv="X-UA-Compatible" content="IE=edge">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <meta property="og:title" content="LinkyLinky">
+            <meta property="og:site_name" content="LinkyLinky by Kauft.es">
+            <meta property="og:url" content="https://kauft.es/">
+            <meta property="og:description" content="LinkyLinky by Kauft.es is a custom url shortener. You're reading this, b/c someone doesn't want their shorturl to be indexed by bots/crawlers/spiders.">
+            <meta property="og:type" content="article">
+            <meta property="og:image" content="https://kauft.es/dashboard/icon_128.png">
+
+            <title>LinkyLinky</title>
+        </head>
+        <body>
+        <p align="center">
+        <img height="150" src="https://kauft.es/dashboard/icon_128.png">
+        <h1 align="center">LinkyLinky 🔗</h1>
+        <h3 align="center">A small url shortener, originaly developed for kauft.es</h3>
+        <p>LinkyLinky by Kauft.es is a custom url shortener.<br>
+        You're reading this, b/c someone doesn't want their shorturl to be indexed by bots/crawlers/spiders.</p>
+        </p>        
+        </body>
+        </html>
+        `;
+    }
+
    res.redirect(302, target[0].target);
    await knex('visits').insert({ shortcode, provider: 'native' });
 })
@@ -121,6 +153,7 @@ const newUrlSchema = {
        properties: {
            target: { type: 'string' },
            shortcode: { type: 'string' },
+            no_preview: { type: 'boolean' },
        }
    }
 };
@@ -129,6 +162,7 @@ const newUrlSchema = {
 fastify.post('/api', { newUrlSchema }, async (req, res) => {
    const target = req.body?.target;
    let shortcode = req.body?.shortcode;
+    let no_preview = req.body?.no_preview || false;

    //Check if the user provided a target
    if (!target) {
@@ -148,7 +182,7 @@ fastify.post('/api', { newUrlSchema }, async (req, res) => {
                return response;
            }
        }
-        const exists = await knex.select('shortcode')
+        const exists = await knex.select('shortcode', 'no_preview')
            .from('urls')
            .where('target', '=', target)
            .limit(1);
@@ -157,7 +191,8 @@ fastify.post('/api', { newUrlSchema }, async (req, res) => {
            return {
                url: `${config.getBaseUrl()}/${shortcode}`,
                shortcode,
-                target
+                target,
+                no_preview: exists[0].no_preview
            }
        }
        shortcode = uniqid();
@@ -179,12 +214,13 @@ fastify.post('/api', { newUrlSchema }, async (req, res) => {
    }

    //Create a new db entry
-    await knex('urls').insert({ target, shortcode });
+    await knex('urls').insert({ target, shortcode, no_preview });

    return {
        url: `${config.getBaseUrl()}/${shortcode}`,
        shortcode,
-        target
+        target,
+        no_preview
    }
 });

@@ -211,7 +247,7 @@ fastify.get('/api/:shortcode', async (req, res) => {
        return 404;
    }

-    const exists = await knex.select('shortcode', 'target')
+    const exists = await knex.select('shortcode', 'target', 'no_preview')
        .from('urls')
        .where('shortcode', '=', shortcode)
        .limit(1);
@@ -227,6 +263,7 @@ fastify.get('/api/:shortcode', async (req, res) => {
        url: `${config.getBaseUrl()}/${exists[0].shortcode}`,
        shortcode: exists[0].shortcode,
        target: exists[0].target,
+        no_preview: exists[0].no_preview,
        visits: visits.length
    }
 });
@@ -285,10 +322,10 @@ fastify.after(() => {

    //Get all visits api route
    fastify.get('/api/visits', { onRequest: fastify.auth([fastify.basicAuth, fastify.verifyJWT]) }, async (req, res) => {
-        if(req.query.provider){
+        if (req.query.provider) {
            return await knex.select('shortcode', 'provider', 'timestamp')
-            .from('visits')
-            .where("provider", "=", req.query.provider);
+                .from('visits')
+                .where("provider", "=", req.query.provider);
        }
        return await knex.select('shortcode', 'provider', 'timestamp')
            .from('visits');
@@ -313,7 +350,7 @@ fastify.after(() => {

    //Get all urls api route
    fastify.get('/api', { onRequest: fastify.auth([fastify.basicAuth, fastify.verifyJWT]) }, async (req, res) => {
-        urls = await knex.select('target', 'shortcode')
+        urls = await knex.select('target', 'shortcode', 'no_preview')
            .from('urls');

        for (let url of urls) {
--- a/yarn.lock
+++ b/yarn.lock
@@ -2228,6 +2228,11 @@ isarray@1.0.0, isarray@~1.0.0:
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

+isbot@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.3.3.tgz#6a2124a6c1dda5db2d0060c4e292b346ecbd2249"
+  integrity sha512-a3HFPPsvtLroqpuTHHJTaUpPHUO0vjPbptJDzJYkymRvOI8tugWM6zE2oq22w5VOq4A5hrX+YRS7VdIPAgWLfw==
+
 isexe@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
Author	SHA1	Message	Date
Nicolai Ort	e1621b72ad	Added rudementary page content All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-25 17:44:34 +02:00
Nicolai Ort	b64a8436e7	Updated opengraph type ref #2	2021-09-25 17:42:44 +02:00
Nicolai Ort	d8ed9a149f	Switched docker base images to odit mirror	2021-09-25 17:38:11 +02:00
Nicolai Ort	9d7125a311	Now with custom opengraph (tm) All checks were successful continuous-integration/drone/push Build is passing Details ref #2	2021-09-25 17:35:52 +02:00
Nicolai Ort	6d71a3ebf4	Removed unused log All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-25 17:27:59 +02:00
Nicolai Ort	75adbf73cf	Now with working bad bot detection ref #2	2021-09-25 17:27:41 +02:00
Nicolai Ort	e5b8557e4c	Getters now return the no_preview status	2021-09-25 17:21:30 +02:00
Nicolai Ort	33d7c94648	New urls can now be created with disabled preview ref #2	2021-09-25 17:19:36 +02:00
Nicolai Ort	f6b2ae523d	Added bot check for native short urls ref #2	2021-09-25 17:17:42 +02:00
Nicolai Ort	0a500f16cd	Added migration for disallowing bot previews	2021-09-25 17:16:38 +02:00
Nicolai Ort	61da5d8110	Added basic bot checking	2021-09-25 17:14:34 +02:00
Nicolai Ort	773b286216	Added package for bot recognition	2021-09-25 17:12:52 +02:00
Nicolai Ort	d097eccbd9	removed logging	2021-09-25 17:12:22 +02:00
Nicolai Ort	f15282a3f9	Log user agents All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-25 17:09:19 +02:00
Nicolai Ort	0a8945a294	Added noindex header to all shorturl routes All checks were successful continuous-integration/drone/push Build is passing Details ref #2	2021-09-25 16:59:28 +02:00