diff options
| -rw-r--r-- | _data/comments.json | 26 | ||||
| -rw-r--r-- | _includes/commentsthread.html | 79 | ||||
| -rw-r--r-- | _layouts/post.html | 18 | ||||
| -rw-r--r-- | _sass/main.scss | 54 | ||||
| -rw-r--r-- | api/Makefile | 6 | ||||
| -rwxr-xr-x | api/api | bin | 0 -> 17992 bytes | |||
| -rw-r--r-- | api/api.c | 244 | ||||
| -rw-r--r-- | api/urlcode.c | 48 | ||||
| -rw-r--r-- | o.md | 1 |
9 files changed, 475 insertions, 1 deletions
diff --git a/_data/comments.json b/_data/comments.json new file mode 100644 index 0000000..037f8c4 --- /dev/null +++ b/_data/comments.json @@ -0,0 +1,26 @@ +[ + { + "author": "Anton Luka Šijanec", + "date": "2020-11-09 22:09:00", + "message": "### komentar\nTo je testiranje funkcije komentiranja.  <script>alert(1);</script>", + "parent": "post|/blog/test/2020/11/06/druga-objava.html" + }, + { + "author": "Anton Luka Šijanec", + "date": "2020-11-09 22:10:00", + "message": "drugi kometar", + "parent": "comment|Anton Luka Šijanec|2020-11-09 22:09:00" + }, + { + "author": "Anton Luka Šijanec", + "date": "2020-11-10 11:28:00", + "message": "tretji kometar", + "parent": "comment|Anton Luka Šijanec|2020-11-09 22:09:00" + }, + { + "author": "Anton Luka Šijanec", + "date": "2020-11-10 11:29:00", + "message": "četrti kometar", + "parent": "comment|Anton Luka Šijanec|2020-11-09 22:10:00" + } +] diff --git a/_includes/commentsthread.html b/_includes/commentsthread.html new file mode 100644 index 0000000..84647f7 --- /dev/null +++ b/_includes/commentsthread.html @@ -0,0 +1,79 @@ +{% comment %} + argv: id_of_object_whose_posts_you_want,__isinathread + return: nothing. outputs html directly. +{% endcomment %} +{% capture taplaceholder %}Vpišite besedilo komentarja (markdown omogočen). +POMEMBNO: Zaradi tehničnih razlogov (veriga blokov) dokončen izbris komentarja (niti vzdevka avtorja) iz Interneta ni mogoč!{% endcapture %} +{% capture nepodpiraiframe %}Vaš brskalnik ne podpira <pre>iframe</pre> elementa, ki je potreben za vpogled v status oddaje komentarja.{% endcapture %} +{% capture editnotice %} +Komentar lahko uredi samo tisti, ki ga je napisal. Komentar uredite v brskalniku, v katerem ste ga napisali. Bodisi piškotek bodisi IP naslov mora biti enak prejšnji oddaji komentarja. Če se objavo uredi še naslednjič, se to lahko stori iz katerega koli IP naslova in piškotka, ki se je uporabil pri predhodnih urejanjih.{% endcapture %} +{% assign comments = site.data.comments | where: "parent", argv[0] %} +{% unless argv[1] %} + {% assign uid = 0 | minus: 1 %} <!-- začnemo z -1, ker se prvi sam poveča --> + {% assign depth = 0 | minus: 1 %} <!-- začnemo z -1, da bo prvi na 0 --> +{% endunless %} +{% for comment in comments %} + {% assign depth = depth | plus: 1 %} + <div class="comment + {% assign depthmodulo = depth | modulo: 2 %} + {% if 0 == depthmodulo %} + odd + {% else %} + even + {% endif %} + "> <!-- depth: {{ depth }} --> + {% assign argv = comment.date | split: "," %} {% include datumincas.html %} + <small class=dimmedtext style=width:100% > + V {{ return }} je {{ comment.author || replace: "<", "<" }} komentiral: + </small> + <p> + {{ comment.message | replace: "<", "<" | replace: "!", "!" | markdownify }} + </p> + <small class=dimmedtext> + <a href="mailto:anton@sijanec.eu?subject=Prijava%20neprimernega%20komentarja%20na%20blogu."> + prijavi</a> + | + {% assign uid = uid | plus: 1 %} + <label for=checkbox{{ uid }} > + <a> + odgovori</a> + </label> + <input type=checkbox id=checkbox{{ uid }} class=commentreplycheckbox > + <div hidden=hidden class=commentform> + <!-- + <form target=comstatus{{ uid }} action=/api?m=commentreply type=POST> + <input type=text name=vzdevek placeholder="Vzdevek pošiljatelja" /> + <input type=submit value=Objavi! /> + <textarea placeholder="{{ taplaceholder }}" name=message ></textarea> + {% assign thisid = "comment|" | append: comment.author | append: "|" | append: comment.date %} + <input type=hidden name=parent value="{{ thisid | replace: '"', """ }}" /> + <iframe id=comstatus{{ uid }}>{{ nepodpiraiframe }}</iframe> + </form> + --> + Objavljanje komentarjev še ni izdelano. + </div> + | + <label for=edit{{ uid }}> + <a>uredi</a> + </label> + <input type=checkbox id=edit{{ uid }} class=commentreplycheckbox > + <div class=commentform > + <!-- + <form action=POST action=/api?m=commentedit target=editstatus{{ uid }} > + <input type=text name=vzdevek value="{{ comment.author | replace: '"', """ }}" /> + <input type=submit value=Uredi! /> + <textarea placeholder="{{ taplaceholder }}{{editnotice}}" name=message ></textarea> + <input type=hidden name=commentid value="{{ thisid | replace: '"', '"' }}"/> + <iframe id=editstatus{{ uid }} >{{ nepodpiraiframe }}</iframe> + </form> + --> + Urejanje komentarjev še ni izdelano. + </div> + </small> + {% assign argv = "true" | split: "," %} + {% assign argv = argv | unshift: thisid %} + {% include commentsthread.html %} + </div> + {% assign depth = depth | minus: 1 %} +{% endfor %} +{% assign return = uid | plus: 1 %} diff --git a/_layouts/post.html b/_layouts/post.html index 3003a33..a2b42bd 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -45,3 +45,21 @@ layout: default {{ return }}. </div> {% endif %} + +<hr> +<h2> + kometarji +</h2> +{% assign argv = "" | split: "," %} +{% assign postid = "post|" | append: page.url %} +{% assign argv = argv | unshift: postid %} <!-- unshift doda na zač. arraya --> +{% capture commentsthreadhtml %} + {% include commentsthread.html %} <!-- outputs html directly --> +{% endcapture %} +<h3> + {{ return }} + {% assign argv = ",komentarjev,komentar,komentarja,komentarji" | prepend: return | split: "," %} + {% include slnum.html %} + {{ return }} +</h3> +{{ commentsthreadhtml }} diff --git a/_sass/main.scss b/_sass/main.scss index a45eb11..3f10bf7 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -23,6 +23,60 @@ table, th, td, tr { border: 1px solid black; } +a { + text-decoration: underline; + cursor: pointer; +} + +/* comments begin */ + + .comment { + margin-left: .5em; + border: 1px solid grey; + padding: .5em; + } + + .odd { + background-color: darkgrey; + } + + .comment small { + color: darkred; + } + + .even { + background-color: lightgrey; + } + + .commentreplycheckbox { + display: none; + } + + .comment iframe, textarea { + width: 90%; + margin-left: 5%; + height: 7em + } + + .comment iframe { + height: 2em; + } + + .comment input[type=text] { + margin-left: 5%; + width: 75%; + } + + .commentform { + display: none; + } + + .commentreplycheckbox:checked + .commentform { + display: block; + } + +/* comments end */ + @media screen and (min-width: 600px) { body { margin-left: 10%; diff --git a/api/Makefile b/api/Makefile new file mode 100644 index 0000000..7b8ab7d --- /dev/null +++ b/api/Makefile @@ -0,0 +1,6 @@ +compile: + gcc api.c -Wall -lfcgi --pedantic -lpthread -o api +prepare: + wget http://www.geekhideout.com/downloads/urlcode.c +clean: + rm urlencode.c api Binary files differdiff --git a/api/api.c b/api/api.c new file mode 100644 index 0000000..e452617 --- /dev/null +++ b/api/api.c @@ -0,0 +1,244 @@ +/* + * threaded.c -- A simple multi-threaded FastCGI application. + */ + +#ifndef lint +// static const char rcsid[] = "$Id: threaded.c,v 1.9 2001/11/20 03:23:21 robs Exp $"; // just popps up warnings +#endif /* not lint */ + +#include "fcgi_config.h" + +#include <pthread.h> +#include <sys/types.h> + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#include "fcgiapp.h" + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include "urlcode.c" +#include <limits.h> +#include <stdio.h> +#define MALLOC_RETURNED_NULL fprintf(stderr, "%s()@" __FILE__ ":%d: malloc() returned NULL\n", __func__, __LINE__); + + +#define THREAD_COUNT 20 + +static int counts[THREAD_COUNT]; + +struct assoc_s { + char * key; + char * value; +}; // value je lahko NULL + +void free_assoc_s(struct assoc_s * s) { + if (s->key != NULL) { + free(s->key); + s->key = NULL; + } + if (s->value != NULL) { + free(s->value); + s->value = NULL; + } + free(s); + s = NULL; + return; +} + +struct request_uri_s { + char * path; + struct assoc_s ** params; // to je "array". zadnji naj bo NULL. +}; + +void free_request_uri_s(struct request_uri_s * s) { + int unsigned i = 0; + while (s->params[i] != NULL) { + free_assoc_s(s->params[i]); + s->params[i++] = NULL; + } + free(s->path); + s->path = NULL; + free(s->params); + s->params = NULL; + free(s); + s = NULL; + return; +} + +struct assoc_s ** parse_html_keyvalue(const char * t) { + struct assoc_s ** params = malloc(sizeof(void *)); + if (params == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + unsigned int o = 0; // številka parametra od 0 vključno z 0 + unsigned int n = 0; // 0 če smo v key, 1 če smo v value, 3 če je konec urija + unsigned int a = 0; // nakazuje pozicijo naslednjega znaka, ki ga bomo napisa. + params[0] = malloc(sizeof(struct assoc_s)); + if (params[0] == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + for (unsigned int e = 0; n != 3 && e <= UINT_MAX; e++) { + switch (t[e]) { + case '\0': + params = realloc(params, sizeof(struct assoc_s)*(o+1)); + if (params == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } // zadnji mora biti null + params[o+1] = NULL; + n = 3; + break; + case '=': + if (n == 0) { // ni treba mallocat, realloca se pred vsakim writom bajta + n = 1; + a = 0; + } else { // this is some undocumented behaviour, adding = to param value + params[o]->value = realloc(params[o]->value, a+1); + if (params[o]->value == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + params[o]->value[a++] = '='; + } + break; + case '&': // tu je treba mallocat, ker assoc_s še ne obstaja za naslednji + n = 0; + a = 0; + o++; + params = realloc(params, sizeof(struct assoc_s)*(o+1)); + if (params == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + params[o] = malloc(sizeof(struct assoc_s)); // value kasneje + if (params[o] == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + break; + default: + if (n == 0) { + params[o]->key = realloc(params[o]->key, a+1); + if (params[o]->key == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + params[o]->key[a++] = t[e]; + } else { + params[o]->value = realloc(params[o]->value, a+1); + if (params[o]->value == NULL) { + MALLOC_RETURNED_NULL + return NULL; + } + params[o]->value[a++] = t[e]; + } + break; + } + } + return params; +} + +struct request_uri_s * parse_request_uri(char * uri) { // returns NULL on fail! + struct request_uri_s * parsed = malloc(sizeof(struct request_uri_s)); + if (parsed == NULL) { // and returns pointer to ONE request_uri_s on success^ + MALLOC_RETURNED_NULL + return NULL; + } + char * t = strchr(uri, '?'); // remember to free /\ ! + if (t != NULL) + t[0] = '\0'; // uri vedno vseeno pride ven nespremenjen/popravljen + parsed->path = malloc(sizeof(char)*strlen(uri)+1); //znak po path je itak NULL + if (parsed->path == NULL) { // malloc returna NULL, fucking panic! + if (t != NULL) // popravimo še \0 nazaj na ? + t[0] = '?'; + MALLOC_RETURNED_NULL + return NULL; + } + strncpy(parsed->path, uri, strlen(uri)+1); // torej zadnji znak patha bo NULL + parsed->params = NULL; // če slučajno ni query_stringa in kmalu returnamo + if (t == NULL) // ni query stringa zato je path parse dovoljšen + return parsed; // parsed.params je NULL, to pred uporabo PREVERIMO! + t[0] = '?'; // ker smo prej zaradi strlen in strncpy dali na NULL, sedaj spre. + t++; // da ne začnemo z vprašajem ampak z prvim znakom + parsed->params = parse_html_keyvalue(t); + return parsed; +} + +static void *doit(void *a) { + intptr_t rc, i, thread_id = (intptr_t)a; + pid_t pid = getpid(); + FCGX_Request request; + char *server_name; + char * uri_to_parse; + struct request_uri_s * parseduri; + + FCGX_InitRequest(&request, 0, 0); + + for (;;) { + static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_mutex_t counts_mutex = PTHREAD_MUTEX_INITIALIZER; + + /* Some platforms require accept() serialization, some don't.. */ + pthread_mutex_lock(&accept_mutex); + rc = FCGX_Accept_r(&request); + pthread_mutex_unlock(&accept_mutex); + + if (rc < 0) + break; + + server_name = FCGX_GetParam("SERVER_NAME", request.envp); + uri_to_parse = FCGX_GetParam("REQUEST_URI", request.envp); + parseduri = parse_request_uri(uri_to_parse); + if (strchr(parseduri->path, 'S') != NULL) { + exit(0); + } + if (parseduri == NULL) { + FCGX_FPrintF(request.out, "Status: 500 Zaledna napaka\r\n" + "Content-Type: text/plain; charset=utf-8\r\n\r\n" + "zgodila se je napaka na strežniku med procesiranjem URIja.\r\n"); + free_request_uri_s(parseduri); + goto doit_finish; + } + FCGX_FPrintF(request.out, + "Status: 200 V redu\r\n" + "Content-type: text/html; charset=utf-8\r\n" + "\r\n" + "<title>FastCGI Pozdravljen svet! (večnitenje v C, knjižnica fcgiapp)</title>" + "<h1>FastCGI Pozdravljen svet! (večnitenje v C, knjižnica fcgiapp)</h1>" + "Nit %d, Proces %ld<p>" + "Števci zahtev za %d niti na strežniku <i>%s</i><p><code>", + thread_id, pid, + THREAD_COUNT, server_name ? server_name : "?"); + free_request_uri_s(parseduri); + pthread_mutex_lock(&counts_mutex); + ++counts[thread_id]; + for (i = 0; i < THREAD_COUNT; i++) + FCGX_FPrintF(request.out, "%5d " , counts[i]); + pthread_mutex_unlock(&counts_mutex); + +doit_finish: + FCGX_Finish_r(&request); + } + + return NULL; +} + +int main(void) { + intptr_t i; + pthread_t id[THREAD_COUNT]; + + FCGX_Init(); + + for (i = 1; i < THREAD_COUNT; i++) + pthread_create(&id[i], NULL, doit, (void*)i); + + doit(0); // trenutno nit uporabimo tudi kot handler, zakaj pa ne (: + + return 0; +} diff --git a/api/urlcode.c b/api/urlcode.c new file mode 100644 index 0000000..ecf34e1 --- /dev/null +++ b/api/urlcode.c @@ -0,0 +1,48 @@ +/* Converts a hex character to its integer value */ +char from_hex(char ch) { + return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; +} + +/* Converts an integer value to its hex character*/ +char to_hex(char code) { + static char hex[] = "0123456789abcdef"; + return hex[code & 15]; +} + +/* Returns a url-encoded version of str */ +/* IMPORTANT: be sure to free() the returned string after use */ +char *url_encode(char *str) { + char *pstr = str, *buf = malloc(strlen(str) * 3 + 1), *pbuf = buf; + while (*pstr) { + if (isalnum(*pstr) || *pstr == '-' || *pstr == '_' || *pstr == '.' || *pstr == '~') + *pbuf++ = *pstr; + else if (*pstr == ' ') + *pbuf++ = '+'; + else + *pbuf++ = '%', *pbuf++ = to_hex(*pstr >> 4), *pbuf++ = to_hex(*pstr & 15); + pstr++; + } + *pbuf = '\0'; + return buf; +} + +/* Returns a url-decoded version of str */ +/* IMPORTANT: be sure to free() the returned string after use */ +char *url_decode(char *str) { + char *pstr = str, *buf = malloc(strlen(str) + 1), *pbuf = buf; + while (*pstr) { + if (*pstr == '%') { + if (pstr[1] && pstr[2]) { + *pbuf++ = from_hex(pstr[1]) << 4 | from_hex(pstr[2]); + pstr += 2; + } + } else if (*pstr == '+') { + *pbuf++ = ' '; + } else { + *pbuf++ = *pstr; + } + pstr++; + } + *pbuf = '\0'; + return buf; +} @@ -21,7 +21,6 @@ Sem velik privrženec odprtokodne, proste in brezplačne programske opreme Kontaktirate me lahko: * prek elektronske pošte: [anton@šijanec.eu](mailto:anton@šijanec.eu), -* prek telefona: [+38 6 64/176-345](tel:+38664176345), * prek XMPP ali SIP protokola: [anton@sijanec.eu](xmpp:anton@sijanec.eu), * prek IRC protokola: [ircs://irc.šijanec.eu:6697 v kanalu #](ircs://irc.šijanec.eu:6697/#). |