chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #1588 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-08-11 20:28:30 -06:00 committed by GitHub
commit 9c3beca75c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Util/ActivityPub/Inbox.php
View file

@ -243,7 +243,7 @@ class Inbox
public function handleAcceptActivity() public function handleAcceptActivity()
{ {
$actor = $this->payload['actor']; $actor = $this->payload['object']['actor'];
$obj = $this->payload['object']['object']; $obj = $this->payload['object']['object'];
$type = $this->payload['object']['type']; $type = $this->payload['object']['type'];
@ -251,8 +251,8 @@ class Inbox
return; return;
} }
$actor = Helpers::validateUrl($actor); $actor = Helpers::validateLocalUrl($actor);
$target = Helpers::validateLocalUrl($obj); $target = Helpers::validateUrl($obj);
if(!$actor || !$target) { if(!$actor || !$target) {
return; return;

61
contrib/nginx.conf
View file

@ -1,22 +1,49 @@
server { server {
listen 80 default_server; listen 443 ssl http2;
listen [::]:80 default_server; listen [::]:443 ssl http2;
server_name localhost; server_name pixelfed.example; # change this to your fqdn
root /home/pixelfed/public; # path to repo/public
index index.php index.html; ssl_certificate /etc/nginx/ssl/server.crt; # generate your own
root /var/www/html/public; ssl_certificate_key /etc/nginx/ssl/server.key; # or use letsencrypt
location / { ssl_protocols TLSv1.2;
try_files $uri $uri/ /$is_args$args; ssl_ciphers EECDH+AESGCM:EECDH+CHACHA20:EECDH+AES;
} ssl_prefer_server_ciphers on;
location ~ \.php$ { add_header X-Frame-Options "SAMEORIGIN";
try_files $uri =404; add_header X-XSS-Protection "1; mode=block";
fastcgi_split_path_info ^(.+\.php)(/.+)$; add_header X-Content-Type-Options "nosniff";
fastcgi_pass php:9000;
fastcgi_index index.php; index index.html index.htm index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; charset utf-8;
fastcgi_param PATH_INFO $fastcgi_path_info;
} location / {
try_files $uri $uri/ /index.php?$query_string;
}
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
error_page 404 /index.php;
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/run/php-fpm/php-fpm.sock; # make sure this is correct
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # or $request_filename
}
location ~ /\.(?!well-known).* {
deny all;
}
}
server { # Redirect http to https
server_name pixelfed.example; # change this to your fqdn
listen 80;
listen [::]:80;
return 301 https://$host$request_uri;
} }