"npm-asset/jgrowl": "^1.4",
"npm-asset/fullcalendar": "^3.0.1",
"npm-asset/cropperjs": "1.2.2",
- "npm-asset/imagesloaded": "4.1.4"
+ "npm-asset/imagesloaded": "4.1.4",
+ "digitalbazaar/json-ld": "^0.4.7"
},
"repositories": [
{
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "5f6a43237dc52758484cd21cd76e8ce6",
+ "content-hash": "36f76191086a7f81370b51d0ff8cea1d",
"packages": [
{
"name": "asika/simple-console",
},
{
"name": "bower-asset/Chart-js",
- "version": "v2.7.1",
+ "version": "v2.7.2",
"source": {
"type": "git",
"url": "https://github.com/chartjs/Chart.js.git",
- "reference": "0fead21939b92c15093c1b7d5ee2627fb5900fff"
+ "reference": "98f104cdd03617f1300b417b3d60c23d4e3e3403"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/0fead21939b92c15093c1b7d5ee2627fb5900fff",
- "reference": "0fead21939b92c15093c1b7d5ee2627fb5900fff",
+ "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/98f104cdd03617f1300b417b3d60c23d4e3e3403",
+ "reference": "98f104cdd03617f1300b417b3d60c23d4e3e3403",
"shasum": ""
},
"type": "bower-asset-library",
"MIT"
],
"description": "Simple HTML5 charts using the canvas element.",
- "time": "2017-10-28T15:01:52+00:00"
+ "time": "2018-03-01T21:45:21+00:00"
},
{
"name": "bower-asset/base64",
},
{
"name": "bower-asset/vue",
- "version": "v2.5.16",
+ "version": "v2.5.17",
"source": {
"type": "git",
"url": "https://github.com/vuejs/vue.git",
- "reference": "25342194016dc3bcc81cb3e8e229b0fb7ba1d1d6"
+ "reference": "636c9b4ef17f2062720b677cbbe613f146f4d4db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vuejs/vue/zipball/25342194016dc3bcc81cb3e8e229b0fb7ba1d1d6",
- "reference": "25342194016dc3bcc81cb3e8e229b0fb7ba1d1d6",
+ "url": "https://api.github.com/repos/vuejs/vue/zipball/636c9b4ef17f2062720b677cbbe613f146f4d4db",
+ "reference": "636c9b4ef17f2062720b677cbbe613f146f4d4db",
"shasum": ""
},
"type": "bower-asset-library"
},
+ {
+ "name": "digitalbazaar/json-ld",
+ "version": "0.4.7",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/digitalbazaar/php-json-ld.git",
+ "reference": "dc1bd23f0ee2efd27ccf636d32d2738dabcee182"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/digitalbazaar/php-json-ld/zipball/dc1bd23f0ee2efd27ccf636d32d2738dabcee182",
+ "reference": "dc1bd23f0ee2efd27ccf636d32d2738dabcee182",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "jsonld.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Digital Bazaar, Inc.",
+ "email": "support@digitalbazaar.com"
+ }
+ ],
+ "description": "A JSON-LD Processor and API implementation in PHP.",
+ "homepage": "https://github.com/digitalbazaar/php-json-ld",
+ "keywords": [
+ "JSON-LD",
+ "Linked Data",
+ "RDF",
+ "Semantic Web",
+ "json",
+ "jsonld"
+ ],
+ "time": "2016-04-25T04:17:52+00:00"
+ },
+ {
+ "name": "divineomega/do-file-cache",
+ "version": "v2.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/DivineOmega/DO-File-Cache.git",
+ "reference": "261c6e30a0de8cd325f826d08b2e51b2e367a1a3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/DivineOmega/DO-File-Cache/zipball/261c6e30a0de8cd325f826d08b2e51b2e367a1a3",
+ "reference": "261c6e30a0de8cd325f826d08b2e51b2e367a1a3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^6.5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "DivineOmega\\DOFileCache\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-3.0-only"
+ ],
+ "description": "DO File Cache is a PHP File-based Caching Library. Its syntax is designed to closely resemble the PHP memcache extension.",
+ "keywords": [
+ "cache",
+ "caching",
+ "caching library",
+ "file cache",
+ "library",
+ "php"
+ ],
+ "time": "2018-09-12T23:08:34+00:00"
+ },
+ {
+ "name": "divineomega/do-file-cache-psr-6",
+ "version": "v2.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/DivineOmega/DO-File-Cache-PSR-6.git",
+ "reference": "18f9807d0491d093e9a12741afb40257d92f017e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/DivineOmega/DO-File-Cache-PSR-6/zipball/18f9807d0491d093e9a12741afb40257d92f017e",
+ "reference": "18f9807d0491d093e9a12741afb40257d92f017e",
+ "shasum": ""
+ },
+ "require": {
+ "divineomega/do-file-cache": "^2.0.0",
+ "psr/cache": "^1.0"
+ },
+ "require-dev": {
+ "cache/integration-tests": "^0.16.0",
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^5.7"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "DivineOmega\\DOFileCachePSR6\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "LGPL-3.0-only"
+ ],
+ "authors": [
+ {
+ "name": "Jordan Hall",
+ "email": "jordan@hall05.co.uk"
+ }
+ ],
+ "description": "PSR-6 adapter for DO File Cache",
+ "time": "2018-07-13T08:32:36+00:00"
+ },
{
"name": "divineomega/password_exposed",
- "version": "v2.5.1",
+ "version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/DivineOmega/password_exposed.git",
- "reference": "c928bf722eb02398df11076add60df070cb55581"
+ "reference": "1f1b49e3ec55b0f07115d342b145091368b081c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/DivineOmega/password_exposed/zipball/c928bf722eb02398df11076add60df070cb55581",
- "reference": "c928bf722eb02398df11076add60df070cb55581",
+ "url": "https://api.github.com/repos/DivineOmega/password_exposed/zipball/1f1b49e3ec55b0f07115d342b145091368b081c4",
+ "reference": "1f1b49e3ec55b0f07115d342b145091368b081c4",
"shasum": ""
},
"require": {
+ "divineomega/do-file-cache-psr-6": "^2.0",
"guzzlehttp/guzzle": "^6.3",
"paragonie/certainty": "^1",
- "php": ">=5.6",
- "rapidwebltd/rw-file-cache-psr-6": "^1.0"
+ "php": ">=5.6"
},
"require-dev": {
"fzaninotto/faker": "^1.7",
+ "php-coveralls/php-coveralls": "^2.1",
"phpunit/phpunit": "^5.7",
- "satooshi/php-coveralls": "^2.0",
"vimeo/psalm": "^1"
},
"type": "library",
}
],
"description": "This PHP package provides a `password_exposed` helper function, that uses the haveibeenpwned.com API to check if a password has been exposed in a data breach.",
- "time": "2018-04-02T18:16:36+00:00"
+ "time": "2018-07-12T22:09:43+00:00"
},
{
"name": "ezyang/htmlpurifier",
},
{
"name": "fxp/composer-asset-plugin",
- "version": "v1.4.2",
+ "version": "v1.4.4",
"source": {
"type": "git",
"url": "https://github.com/fxpio/composer-asset-plugin.git",
- "reference": "61352d99940d2b2392a5d2db83b8c0ef5faf222a"
+ "reference": "0d07328eef6e6f3753aa835fd2faef7fed1717bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fxpio/composer-asset-plugin/zipball/61352d99940d2b2392a5d2db83b8c0ef5faf222a",
- "reference": "61352d99940d2b2392a5d2db83b8c0ef5faf222a",
+ "url": "https://api.github.com/repos/fxpio/composer-asset-plugin/zipball/0d07328eef6e6f3753aa835fd2faef7fed1717bf",
+ "reference": "0d07328eef6e6f3753aa835fd2faef7fed1717bf",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "composer/composer": "^1.4.0"
+ "composer/composer": "^1.6.0"
},
"type": "composer-plugin",
"extra": {
"npm",
"package"
],
- "time": "2017-10-20T06:53:56+00:00"
+ "time": "2018-07-02T11:37:17+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.3.0",
+ "version": "6.3.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
+ "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
- "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+ "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"shasum": ""
},
"require": {
},
"require-dev": {
"ext-curl": "*",
- "phpunit/phpunit": "^4.0 || ^5.0",
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.0"
},
"suggest": {
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.2-dev"
+ "dev-master": "6.3-dev"
}
},
"autoload": {
"rest",
"web service"
],
- "time": "2017-06-22T18:50:49+00:00"
+ "time": "2018-04-22T15:46:56+00:00"
},
{
"name": "guzzlehttp/promises",
},
{
"name": "mobiledetect/mobiledetectlib",
- "version": "2.8.30",
+ "version": "2.8.33",
"source": {
"type": "git",
"url": "https://github.com/serbanghita/Mobile-Detect.git",
- "reference": "5500bbbf312fe77ef0c7223858dad84fe49ee0c3"
+ "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/5500bbbf312fe77ef0c7223858dad84fe49ee0c3",
- "reference": "5500bbbf312fe77ef0c7223858dad84fe49ee0c3",
+ "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/cd385290f9a0d609d2eddd165a1e44ec1bf12102",
+ "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102",
"shasum": ""
},
"require": {
"mobile detector",
"php mobile detect"
],
- "time": "2017-12-18T10:38:51+00:00"
+ "time": "2018-09-01T15:05:15+00:00"
},
{
"name": "npm-asset/cropperjs",
},
{
"name": "npm-asset/fullcalendar",
- "version": "3.8.2",
+ "version": "3.9.0",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.8.2.tgz",
+ "url": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-3.9.0.tgz",
"reference": null,
- "shasum": "ef7dc77b89134bbe6163e51136f7a1f8bfc1d807"
+ "shasum": "b608a9989f3416f0b1d526c6bdfeeaf2ac79eda5"
},
"require": {
"npm-asset/jquery": ">=2,<4.0",
- "npm-asset/moment": ">=2.9.0,<3.0.0"
- },
- "require-dev": {
- "npm-asset/awesome-typescript-loader": ">=3.3.0,<4.0.0",
- "npm-asset/bootstrap": ">=3.3.7,<4.0.0",
- "npm-asset/components-jqueryui": "dev-github:components/jqueryui",
- "npm-asset/css-loader": ">=0.28.7,<0.29.0",
- "npm-asset/del": ">=2.2.1,<3.0.0",
- "npm-asset/dts-generator": ">=2.1.0,<3.0.0",
- "npm-asset/eslint": ">=4.13.1,<5.0.0",
- "npm-asset/eslint-config-standard": ">=11.0.0-beta.0,<12.0.0",
- "npm-asset/eslint-plugin-import": ">=2.8.0,<3.0.0",
- "npm-asset/eslint-plugin-node": ">=5.2.1,<6.0.0",
- "npm-asset/eslint-plugin-promise": ">=3.6.0,<4.0.0",
- "npm-asset/eslint-plugin-standard": ">=3.0.1,<4.0.0",
- "npm-asset/extract-text-webpack-plugin": ">=3.0.2,<4.0.0",
- "npm-asset/glob": ">=7.1.2,<8.0.0",
- "npm-asset/gulp": ">=3.9.1,<4.0.0",
- "npm-asset/gulp-cssmin": ">=0.1.7,<0.2.0",
- "npm-asset/gulp-eslint": ">=4.0.0,<5.0.0",
- "npm-asset/gulp-filter": ">=4.0.0,<5.0.0",
- "npm-asset/gulp-modify-file": ">=1.0.0,<2.0.0",
- "npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
- "npm-asset/gulp-shell": ">=0.6.5,<0.7.0",
- "npm-asset/gulp-tslint": ">=8.1.2,<9.0.0",
- "npm-asset/gulp-uglify": ">=2.0.0,<3.0.0",
- "npm-asset/gulp-util": ">=3.0.7,<4.0.0",
- "npm-asset/gulp-watch": ">=4.3.11,<5.0.0",
- "npm-asset/gulp-zip": ">=3.2.0,<4.0.0",
- "npm-asset/jasmine-core": "2.5.2",
- "npm-asset/jasmine-fixture": ">=2.0.0,<3.0.0",
- "npm-asset/jasmine-jquery": ">=2.1.1,<3.0.0",
- "npm-asset/jquery-mockjax": ">=2.2.0,<3.0.0",
- "npm-asset/jquery-simulate": "dev-github:jquery/jquery-simulate",
- "npm-asset/karma": ">=0.13.22,<0.14.0",
- "npm-asset/karma-jasmine": ">=1.0.2,<2.0.0",
- "npm-asset/karma-phantomjs-launcher": ">=1.0.0,<2.0.0",
- "npm-asset/karma-sourcemap-loader": ">=0.3.7,<0.4.0",
- "npm-asset/karma-verbose-reporter": "0.0.6",
- "npm-asset/moment-timezone": ">=0.5.5,<0.6.0",
- "npm-asset/native-promise-only": ">=0.8.1,<0.9.0",
- "npm-asset/node-sass": ">=4.7.2,<5.0.0",
- "npm-asset/phantomjs-prebuilt": ">=2.1.7,<3.0.0",
- "npm-asset/sass-loader": ">=6.0.6,<7.0.0",
- "npm-asset/tslib": ">=1.8.0,<2.0.0",
- "npm-asset/tslint": ">=5.8.0,<6.0.0",
- "npm-asset/tslint-config-standard": ">=7.0.0,<8.0.0",
- "npm-asset/types--jquery": "2.0.47",
- "npm-asset/typescript": ">=2.6.2,<3.0.0",
- "npm-asset/webpack": ">=3.8.1,<4.0.0",
- "npm-asset/webpack-stream": ">=4.0.0,<5.0.0",
- "npm-asset/yargs": ">=4.8.1,<5.0.0"
+ "npm-asset/moment": ">=2.20.1,<3.0.0"
},
"type": "npm-asset-library",
"extra": {
"full-sized",
"jquery-plugin"
],
- "time": "2018-01-30T23:49:01+00:00"
+ "time": "2018-03-05T03:30:23+00:00"
},
{
"name": "npm-asset/imagesloaded",
},
{
"name": "npm-asset/jquery-datetimepicker",
- "version": "2.5.17",
+ "version": "2.5.20",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/jquery-datetimepicker/-/jquery-datetimepicker-2.5.17.tgz",
+ "url": "https://registry.npmjs.org/jquery-datetimepicker/-/jquery-datetimepicker-2.5.20.tgz",
"reference": null,
- "shasum": "8857a631f248081d4072563bde40fa8c17e407b1"
+ "shasum": "687d6204b90b03dc93f725f8df036e1d061f37ac"
},
"require": {
"npm-asset/jquery": ">=1.7.2",
"npm-asset/php-date-formatter": ">=1.3.4,<2.0.0"
},
"require-dev": {
+ "npm-asset/chai": ">=4.1.2,<5.0.0",
"npm-asset/concat": "dev-github:azer/concat",
"npm-asset/concat-cli": ">=4.0.0,<5.0.0",
+ "npm-asset/karma": ">=2.0.0,<3.0.0",
+ "npm-asset/karma-chai": ">=0.1.0,<0.2.0",
+ "npm-asset/karma-firefox-launcher": ">=1.1.0,<2.0.0",
+ "npm-asset/karma-mocha": ">=1.3.0,<2.0.0",
+ "npm-asset/mocha": ">=5.0.4,<6.0.0",
"npm-asset/uglifycss": ">=0.0.27,<0.0.28",
"npm-asset/uglifyjs": ">=2.4.10,<3.0.0"
},
"url": "git+https://github.com/xdan/datetimepicker.git"
},
"npm-asset-scripts": {
- "test": "echo \"Error: no test specified\" && exit 1",
+ "test": "karma start --browsers Firefox karma.conf.js --single-run",
"concat": "concat-cli -f node_modules/php-date-formatter/js/php-date-formatter.min.js jquery.datetimepicker.js node_modules/jquery-mousewheel/jquery.mousewheel.js -o build/jquery.datetimepicker.full.js",
"minify": "uglifyjs jquery.datetimepicker.js -c -m -o build/jquery.datetimepicker.min.js && uglifycss jquery.datetimepicker.css > build/jquery.datetimepicker.min.css",
"minifyconcat": "uglifyjs build/jquery.datetimepicker.full.js -c -m -o build/jquery.datetimepicker.full.min.js",
"github": "git add --all && git commit -m \"New version %npm_package_version% \" && git tag %npm_package_version% && git push --tags origin HEAD:master && npm publish",
"build": "npm run minify && npm run concat && npm run minifyconcat",
- "public": "npm version patch --no-git-tag-version && npm run build && npm run github"
+ "public": "npm run test && npm version patch --no-git-tag-version && npm run build && npm run github"
}
},
"license": [
{
"name": "Chupurnov",
"email": "chupurnov@gmail.com",
- "url": "http://xdsoft.net/"
+ "url": "https://xdsoft.net/"
}
],
"description": "jQuery Plugin DateTimePicker it is DatePicker and TimePicker in one",
"time",
"timepicker"
],
- "time": "2018-01-23T05:56:50+00:00"
+ "time": "2018-03-21T16:26:39+00:00"
},
{
"name": "npm-asset/jquery-mousewheel",
},
{
"name": "npm-asset/moment",
- "version": "2.20.1",
+ "version": "2.22.2",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
+ "url": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
"reference": null,
- "shasum": "d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
- },
- "require-dev": {
- "npm-asset/benchmark": "dev-default|*",
- "npm-asset/coveralls": ">=2.11.2,<3.0.0",
- "npm-asset/es6-promise": "dev-default|*",
- "npm-asset/grunt": "~0.4",
- "npm-asset/grunt-benchmark": "dev-default|*",
- "npm-asset/grunt-cli": "dev-default|*",
- "npm-asset/grunt-contrib-clean": "dev-default|*",
- "npm-asset/grunt-contrib-concat": "dev-default|*",
- "npm-asset/grunt-contrib-copy": "dev-default|*",
- "npm-asset/grunt-contrib-jshint": "dev-default|*",
- "npm-asset/grunt-contrib-uglify": "dev-default|*",
- "npm-asset/grunt-contrib-watch": "dev-default|*",
- "npm-asset/grunt-env": "dev-default|*",
- "npm-asset/grunt-exec": "dev-default|*",
- "npm-asset/grunt-jscs": "dev-default|*",
- "npm-asset/grunt-karma": "dev-default|*",
- "npm-asset/grunt-nuget": "dev-default|*",
- "npm-asset/grunt-string-replace": "dev-default|*",
- "npm-asset/karma": "dev-default|*",
- "npm-asset/karma-chrome-launcher": "dev-default|*",
- "npm-asset/karma-firefox-launcher": "dev-default|*",
- "npm-asset/karma-qunit": "dev-default|*",
- "npm-asset/karma-sauce-launcher": "dev-default|*",
- "npm-asset/load-grunt-tasks": "dev-default|*",
- "npm-asset/nyc": ">=2.1.4,<3.0.0",
- "npm-asset/qunit": ">=0.7.5,<0.8.0",
- "npm-asset/qunit-cli": ">=0.1.4,<0.2.0",
- "npm-asset/rollup": "dev-default|*",
- "npm-asset/spacejam": "dev-default|*",
- "npm-asset/typescript": ">=1.8.10,<2.0.0",
- "npm-asset/uglify-js": "dev-default|*"
+ "shasum": "3c257f9839fc0e93ff53149632239eb90783ff66"
},
"type": "npm-asset-library",
"extra": {
"time",
"validate"
],
- "time": "2017-12-19T04:44:18+00:00"
+ "time": "2018-06-01T06:58:41+00:00"
},
{
"name": "npm-asset/php-date-formatter",
- "version": "1.3.4",
+ "version": "v1.3.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/php-date-formatter.git",
+ "reference": "d842e1c4e6a8d6108017b726321c305bb5ae4fb5"
+ },
"dist": {
- "type": "tar",
- "url": "https://registry.npmjs.org/php-date-formatter/-/php-date-formatter-1.3.4.tgz",
- "reference": null,
- "shasum": "09a15ae0766ba0beb1900c27c1ec319ef2e4563e"
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/php-date-formatter/zipball/d842e1c4e6a8d6108017b726321c305bb5ae4fb5",
+ "reference": "d842e1c4e6a8d6108017b726321c305bb5ae4fb5",
+ "shasum": ""
},
"type": "npm-asset-library",
"extra": {
},
"npm-asset-repository": {
"type": "git",
- "url": "git+https://github.com/kartik-v/php-date-formatter.git"
- },
- "npm-asset-scripts": []
+ "url": "https://github.com/kartik-v/php-date-formatter.git"
+ }
},
"license": [
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Kartik Visweswaran",
- "email": "kartikv2@gmail.com"
- }
+ "Kartik Visweswaran <kartikv2@gmail.com>"
],
"description": "A Javascript datetime formatting and manipulation library using PHP date-time formats.",
"homepage": "https://github.com/kartik-v/php-date-formatter",
- "time": "2016-02-18T15:15:55+00:00"
+ "time": "2018-07-13T06:56:46+00:00"
},
{
"name": "paragonie/certainty",
- "version": "v1.0.2",
+ "version": "v1.0.4",
"source": {
"type": "git",
"url": "https://github.com/paragonie/certainty.git",
- "reference": "a2d14f5b0b85c58329dee248d77d34e7e1202a32"
+ "reference": "d0f22c0fe579cf0e4f8ee301de5bc97ab124faac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/certainty/zipball/a2d14f5b0b85c58329dee248d77d34e7e1202a32",
- "reference": "a2d14f5b0b85c58329dee248d77d34e7e1202a32",
+ "url": "https://api.github.com/repos/paragonie/certainty/zipball/d0f22c0fe579cf0e4f8ee301de5bc97ab124faac",
+ "reference": "d0f22c0fe579cf0e4f8ee301de5bc97ab124faac",
"shasum": ""
},
"require": {
"ssl",
"tls"
],
- "time": "2018-03-12T18:34:23+00:00"
+ "time": "2018-04-09T07:21:55+00:00"
},
{
"name": "paragonie/constant_time_encoding",
- "version": "v1.0.2",
+ "version": "v2.2.2",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
- "reference": "6111a38faf6fdebc14e36652d22036f379ba58d3"
+ "reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/6111a38faf6fdebc14e36652d22036f379ba58d3",
- "reference": "6111a38faf6fdebc14e36652d22036f379ba58d3",
+ "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/eccf915f45f911bfb189d1d1638d940ec6ee6e33",
+ "reference": "eccf915f45f911bfb189d1d1638d940ec6ee6e33",
"shasum": ""
},
"require": {
- "php": "^5.3|^7"
+ "php": "^7"
},
"require-dev": {
- "paragonie/random_compat": "^1|^2",
- "phpunit/phpunit": "4.*|5.*",
+ "phpunit/phpunit": "^6|^7",
"vimeo/psalm": "^1"
},
"type": "library",
"hex2bin",
"rfc4648"
],
- "time": "2018-03-10T19:46:06+00:00"
+ "time": "2018-03-10T19:47:49+00:00"
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.11",
+ "version": "v2.0.17",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
+ "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
- "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
+ "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
"shasum": ""
},
"require": {
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
+ "polyfill",
"pseudorandom",
"random"
],
- "time": "2017-09-27T21:40:39+00:00"
+ "time": "2018-07-04T16:31:37+00:00"
},
{
"name": "paragonie/sodium_compat",
- "version": "v1.6.0",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
- "reference": "1f6e5682eff4a5a6a394b14331a1904f1740e432"
+ "reference": "7b73005be3c224f12c47bd75a23ce24b762e47e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/1f6e5682eff4a5a6a394b14331a1904f1740e432",
- "reference": "1f6e5682eff4a5a6a394b14331a1904f1740e432",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/7b73005be3c224f12c47bd75a23ce24b762e47e8",
+ "reference": "7b73005be3c224f12c47bd75a23ce24b762e47e8",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "^1|^2",
+ "paragonie/random_compat": ">=1",
"php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
},
"require-dev": {
"secret-key cryptography",
"side-channel resistant"
],
- "time": "2018-02-15T05:50:20+00:00"
+ "time": "2018-09-22T03:59:58+00:00"
},
{
"name": "pear/text_languagedetect",
],
"time": "2016-08-06T14:39:51+00:00"
},
- {
- "name": "rapidwebltd/rw-file-cache",
- "version": "v1.2.5",
- "source": {
- "type": "git",
- "url": "https://github.com/rapidwebltd/RW-File-Cache.git",
- "reference": "4a1d5aaefa6ffafec8e2d60787f12bcd9890977e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/rapidwebltd/RW-File-Cache/zipball/4a1d5aaefa6ffafec8e2d60787f12bcd9890977e",
- "reference": "4a1d5aaefa6ffafec8e2d60787f12bcd9890977e",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "rapidweb\\RWFileCache\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "LGPL-3.0-only"
- ],
- "description": "RW File Cache is a PHP File-based Caching Library. Its syntax is designed to closely resemble the PHP memcache extension.",
- "homepage": "https://github.com/rapidwebltd/RW-File-Cache",
- "keywords": [
- "cache",
- "caching",
- "caching library",
- "file cache",
- "library",
- "php"
- ],
- "time": "2018-01-23T17:20:58+00:00"
- },
- {
- "name": "rapidwebltd/rw-file-cache-psr-6",
- "version": "v1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/rapidwebltd/RW-File-Cache-PSR-6.git",
- "reference": "b74ea201d4c964f0e6db0fb036d1ab28a570df66"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/rapidwebltd/RW-File-Cache-PSR-6/zipball/b74ea201d4c964f0e6db0fb036d1ab28a570df66",
- "reference": "b74ea201d4c964f0e6db0fb036d1ab28a570df66",
- "shasum": ""
- },
- "require": {
- "psr/cache": "^1.0",
- "rapidwebltd/rw-file-cache": "^1.2.3"
- },
- "require-dev": {
- "cache/integration-tests": "^0.16.0",
- "phpunit/phpunit": "^5.7"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "rapidweb\\RWFileCachePSR6\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "LGPL-3.0-only"
- ],
- "authors": [
- {
- "name": "Jordan Hall",
- "email": "jordan.hall@rapidweb.biz"
- }
- ],
- "description": "PSR-6 adapter for RW File Cache",
- "time": "2018-01-30T19:13:45+00:00"
- },
{
"name": "seld/cli-prompt",
"version": "1.0.3",
},
{
"name": "smarty/smarty",
- "version": "v3.1.31",
+ "version": "v3.1.33",
"source": {
"type": "git",
"url": "https://github.com/smarty-php/smarty.git",
- "reference": "c7d42e4a327c402897dd587871434888fde1e7a9"
+ "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c7d42e4a327c402897dd587871434888fde1e7a9",
- "reference": "c7d42e4a327c402897dd587871434888fde1e7a9",
+ "url": "https://api.github.com/repos/smarty-php/smarty/zipball/dd55b23121e55a3b4f1af90a707a6c4e5969530f",
+ "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f",
"shasum": ""
},
"require": {
"keywords": [
"templating"
],
- "time": "2016-12-14T21:57:25+00:00"
+ "time": "2018-09-12T20:54:16+00:00"
}
],
"packages-dev": [
],
"time": "2017-10-19T19:58:43+00:00"
},
- {
- "name": "phar-io/version",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phar-io/version.git",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "Developer"
- }
- ],
- "description": "Library for handling version information and constraints",
- "time": "2017-03-05T17:38:23+00:00"
- },
{
"name": "phpdocumentor/reflection-common",
"version": "1.0.1",
},
{
"name": "phpspec/prophecy",
- "version": "1.7.6",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+ "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"shasum": ""
},
"require": {
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.8.x-dev"
}
},
"autoload": {
"spy",
"stub"
],
- "time": "2018-04-18T13:57:24+00:00"
+ "time": "2018-08-05T17:53:17+00:00"
},
{
"name": "phpunit/dbunit",
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00"
},
+ {
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.9.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.9-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ },
+ {
+ "name": "Gert de Pagter",
+ "email": "BackEndTea@gmail.com"
+ }
+ ],
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
+ ],
+ "time": "2018-08-06T14:22:27+00:00"
+ },
{
"name": "symfony/yaml",
- "version": "v3.4.8",
+ "version": "v3.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0"
+ "reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0",
- "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/c2f4812ead9f847cb69e90917ca7502e6892d6b8",
+ "reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8"
+ "php": "^5.5.9|>=7.0.8",
+ "symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/console": "<3.4"
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2018-04-03T05:14:20+00:00"
+ "time": "2018-08-10T07:34:36+00:00"
},
{
"name": "webmozart/assert",
"name": ["UNIQUE", "name"]
}
},
+ "apcontact": {
+ "comment": "ActivityPub compatible contacts - used in the ActivityPub implementation",
+ "fields": {
+ "url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "URL of the contact"},
+ "uuid": {"type": "varchar(255)", "comment": ""},
+ "type": {"type": "varchar(20)", "not null": "1", "comment": ""},
+ "following": {"type": "varchar(255)", "comment": ""},
+ "followers": {"type": "varchar(255)", "comment": ""},
+ "inbox": {"type": "varchar(255)", "not null": "1", "comment": ""},
+ "outbox": {"type": "varchar(255)", "comment": ""},
+ "sharedinbox": {"type": "varchar(255)", "comment": ""},
+ "nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+ "name": {"type": "varchar(255)", "comment": ""},
+ "about": {"type": "text", "comment": ""},
+ "photo": {"type": "varchar(255)", "comment": ""},
+ "addr": {"type": "varchar(255)", "comment": ""},
+ "alias": {"type": "varchar(255)", "comment": ""},
+ "pubkey": {"type": "text", "comment": ""},
+ "baseurl": {"type": "varchar(255)", "comment": "baseurl of the ap contact"},
+ "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+
+ },
+ "indexes": {
+ "PRIMARY": ["url"],
+ "addr": ["addr(32)"],
+ "url": ["followers(190)"]
+ }
+ },
"attach": {
"comment": "file attachments",
"fields": {
"reply-to-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "URI to which this item is a reply"},
"conversation-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation URI"},
"conversation-href": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation link"},
- "protocol": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "The protocol of the item"},
+ "protocol": {"type": "tinyint unsigned", "not null": "1", "default": "255", "comment": "The protocol of the item"},
"source": {"type": "mediumtext", "comment": "Original source"},
"received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Receiving date"}
},
if (in_array($mode, ['community', 'contacts'])) {
$writable = true;
} else {
- $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+ $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
if (!local_user()) {
foreach ($items as $index => $item) {
if ($item['uid'] == 0) {
- $items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+ $items[$index]['writable'] = in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
}
}
}
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
- in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+ in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
$menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
* First see if we have an addon which is masquerading as a module.
*/
+ if ($a->module == 'object') {
+ $a->module = 'display';
+ }
+
// Compatibility with the Android Diaspora client
if ($a->module == 'stream') {
goaway('network?f=&order=post');
'$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system','community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices],
'$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")],
'$ostatus_disabled' => ['ostatus_disabled', L10n::t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), L10n::t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")],
- '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")],
+ '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")],
'$ostatus_not_able' => L10n::t("OStatus support can only be enabled if threading is enabled."),
'$diaspora_able' => $diaspora_able,
'$diaspora_not_able' => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
$relation_text = '';
}
- if (!in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+ if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
$relation_text = "";
}
}
$lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
- $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
+ $poll_enabled = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"]));
$profiledata = Contact::getDetailsByURL($contact["url"]);
if (local_user()) {
- if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
}
}
$profiledata = Contact::getDetailsByURL($contact["url"]);
if (local_user()) {
- if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
}
}
*/
function contact_actions($contact)
{
- $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
+ $poll_enabled = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
$contact_actions = [];
// Provide friend suggestion only for Friendica contacts
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\ActivityPub;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
intval($contact_id)
);
} else {
+ if ($network == Protocol::ACTIVITYPUB) {
+ ActivityPub::transmitContactAccept($contact['url'], $contact['hub-verify'], $uid);
+ $pending = true;
+ } else {
+ $pending = false;
+ }
+
// $network !== Protocol::DFRN
$network = defaults($contact, 'network', Protocol::OSTATUS);
- $arr = Probe::uri($contact['url']);
+ $arr = Probe::uri($contact['url'], $network);
$notify = defaults($contact, 'notify' , $arr['notify']);
$poll = defaults($contact, 'poll' , $arr['poll']);
$new_relation = $contact['rel'];
$writable = $contact['writable'];
- if ($network === Protocol::DIASPORA) {
+ if (in_array($network, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
if ($duplex) {
$new_relation = Contact::FRIEND;
} else {
DBA::delete('intro', ['id' => $intro_id]);
- $r = q("UPDATE `contact` SET `name-date` = '%s',
- `uri-date` = '%s',
- `addr` = '%s',
- `notify` = '%s',
- `poll` = '%s',
- `blocked` = 0,
- `pending` = 0,
- `network` = '%s',
- `writable` = %d,
- `hidden` = %d,
- `rel` = %d
- WHERE `id` = %d
- ",
- DBA::escape(DateTimeFormat::utcNow()),
- DBA::escape(DateTimeFormat::utcNow()),
- DBA::escape($addr),
- DBA::escape($notify),
- DBA::escape($poll),
- DBA::escape($network),
- intval($writable),
- intval($hidden),
- intval($new_relation),
- intval($contact_id)
- );
+ $fields = ['name-date' => DateTimeFormat::utcNow(),
+ 'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr,
+ 'notify' => $notify, 'poll' => $poll, 'blocked' => false,
+ 'pending' => $pending, 'network' => $network,
+ 'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation];
+ DBA::update('contact', $fields, ['id' => $contact_id]);
}
if (!DBA::isResult($r)) {
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
+ if ($network == Protocol::ACTIVITYPUB && $duplex) {
+ ActivityPub::transmitActivity('Follow', $contact['url'], $uid);
+ }
+
// Let's send our user to the contact editor in case they want to
// do anything special with this new friend.
if ($handsfree === null) {
if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
(substr(normalise_link($search), 0, 7) == "http://")) {
$user_data = Probe::uri($search);
- $discover_user = (in_array($user_data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
+ $discover_user = (in_array($user_data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
}
}
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Protocol\DFRN;
+use Friendica\Protocol\ActivityPub;
function display_init(App $a)
{
$item = null;
- $fields = ['id', 'parent', 'author-id', 'body', 'uid'];
+ $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
// If there is only one parameter, then check if this parameter could be a guid
if ($a->argc == 2) {
displayShowFeed($item["id"], false);
}
+ if (ActivityPub::isRequest()) {
+ $wall_item = Item::selectFirst(['id', 'uid'], ['guid' => $item['guid'], 'wall' => true]);
+ if (DBA::isResult($wall_item)) {
+ $data = ActivityPub::createObjectFromItemID($wall_item['id']);
+ echo json_encode($data);
+ exit();
+ }
+ }
if ($item["id"] != $item["parent"]) {
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
}
use Friendica\Module\Login;
use Friendica\Protocol\DFRN;
use Friendica\Util\DateTimeFormat;
+use Friendica\Protocol\ActivityPub;
function profile_init(App $a)
{
DFRN::autoRedir($a, $which);
}
+ if (ActivityPub::isRequest()) {
+ $user = DBA::selectFirst('user', ['uid'], ['nickname' => $which]);
+ if (DBA::isResult($user)) {
+ $data = ActivityPub::profile($user['uid']);
+ echo json_encode($data);
+ exit();
+ }
+ }
+
Profile::load($a, $which, $profile);
$blocked = !local_user() && !remote_user() && Config::get('system', 'block_public');
['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
+ ['rel' => 'self', 'type' => 'application/activity+json', 'href' => $profile_url],
['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
]
];
+
echo json_encode($json);
killme();
}
public static function networkToName($s, $profile = "")
{
$nets = [
- Protocol::DFRN => L10n::t('Friendica'),
- Protocol::OSTATUS => L10n::t('OStatus'),
- Protocol::FEED => L10n::t('RSS/Atom'),
- Protocol::MAIL => L10n::t('Email'),
- Protocol::DIASPORA => L10n::t('Diaspora'),
- Protocol::ZOT => L10n::t('Zot!'),
- Protocol::LINKEDIN => L10n::t('LinkedIn'),
- Protocol::XMPP => L10n::t('XMPP/IM'),
- Protocol::MYSPACE => L10n::t('MySpace'),
- Protocol::GPLUS => L10n::t('Google+'),
- Protocol::PUMPIO => L10n::t('pump.io'),
- Protocol::TWITTER => L10n::t('Twitter'),
- Protocol::DIASPORA2 => L10n::t('Diaspora Connector'),
- Protocol::STATUSNET => L10n::t('GNU Social Connector'),
- Protocol::PNUT => L10n::t('pnut'),
+ Protocol::DFRN => L10n::t('Friendica'),
+ Protocol::OSTATUS => L10n::t('OStatus'),
+ Protocol::FEED => L10n::t('RSS/Atom'),
+ Protocol::MAIL => L10n::t('Email'),
+ Protocol::DIASPORA => L10n::t('Diaspora'),
+ Protocol::ZOT => L10n::t('Zot!'),
+ Protocol::LINKEDIN => L10n::t('LinkedIn'),
+ Protocol::XMPP => L10n::t('XMPP/IM'),
+ Protocol::MYSPACE => L10n::t('MySpace'),
+ Protocol::GPLUS => L10n::t('Google+'),
+ Protocol::PUMPIO => L10n::t('pump.io'),
+ Protocol::TWITTER => L10n::t('Twitter'),
+ Protocol::DIASPORA2 => L10n::t('Diaspora Connector'),
+ Protocol::STATUSNET => L10n::t('GNU Social Connector'),
+ Protocol::ACTIVITYPUB => L10n::t('ActivityPub'),
+ Protocol::PNUT => L10n::t('pnut'),
];
Addon::callHooks('network_to_name', $nets);
$networkname = str_replace($search, $replace, $s);
- if ((in_array($s, [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
+ if ((in_array($s, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
$r = DBA::fetchFirst("SELECT `gserver`.`platform` FROM `gcontact`
INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
if (DBA::isResult($r)) {
$networkname = $r['platform'];
+
+ if ($s == Protocol::ACTIVITYPUB) {
+ $networkname .= ' (AP)';
+ }
}
}
$nets = array();
while ($rr = DBA::fetch($r)) {
- /// @TODO If 'network' is not there, this triggers an E_NOTICE
- if ($rr['network']) {
- $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
- }
+ $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
}
DBA::close($r);
use Friendica\Model\Profile;
use Friendica\Network\Probe;
use Friendica\Object\Image;
+use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
}
} elseif ($contact['network'] == Protocol::DIASPORA) {
Diaspora::sendUnshare($user, $contact);
+ } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+ ActivityPub::transmitContactUndo($contact['url'], $user['uid']);
+
+ if ($dissolve) {
+ ActivityPub::transmitContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
+ }
}
}
}
if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
- && in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
+ && in_array($profile["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
) {
Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
}
if (!x($contact, 'avatar')) {
$update_contact = true;
}
-
if (!$update_contact || $no_update) {
return $contact_id;
}
}
// Last try in gcontact for unsupported networks
- if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
+ if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
if ($uid != 0) {
return 0;
}
require_once 'include/conversation.php';
- // There are no posts with "uid = 0" with connector networks
- // This speeds up the query a lot
- $r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
- WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
- DBA::escape(normalise_link($contact_url))
- );
+ $cid = Self::getIdForURL($contact_url);
- if (!DBA::isResult($r)) {
+ $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
return '';
}
- if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+ if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else {
$sql = "`item`.`uid` = ?";
}
- $author_id = intval($r[0]["author-id"]);
-
- $contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+ $contact_field = ($contact["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
if ($thread_mode) {
- $condition = ["`$contact` = ? AND `gravity` = ? AND " . $sql,
- $author_id, GRAVITY_PARENT, local_user()];
+ $condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
+ $cid, GRAVITY_PARENT, local_user()];
} else {
- $condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
- $author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+ $condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
+ $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
}
$params = ['order' => ['created' => true],
}
/**
- * @param integer $id contact id
+ * @param integer $id contact id
+ * @param string $network Optional network we are probing for
* @return boolean
*/
- public static function updateFromProbe($id)
+ public static function updateFromProbe($id, $network = '')
{
/*
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
return false;
}
- $ret = Probe::uri($contact["url"]);
+ $ret = Probe::uri($contact["url"], $network);
// If Probe::uri fails the network code will be different
- if ($ret["network"] != $contact["network"]) {
+ if (($ret["network"] != $contact["network"]) && ($ret["network"] != $network)) {
return false;
}
DBA::update(
'contact', [
- 'url' => $ret['url'],
- 'nurl' => normalise_link($ret['url']),
- 'addr' => $ret['addr'],
- 'alias' => $ret['alias'],
- 'batch' => $ret['batch'],
- 'notify' => $ret['notify'],
- 'poll' => $ret['poll'],
- 'poco' => $ret['poco']
+ 'url' => $ret['url'],
+ 'nurl' => normalise_link($ret['url']),
+ 'network' => $ret['network'],
+ 'addr' => $ret['addr'],
+ 'alias' => $ret['alias'],
+ 'batch' => $ret['batch'],
+ 'notify' => $ret['notify'],
+ 'poll' => $ret['poll'],
+ 'poco' => $ret['poco']
],
['id' => $id]
);
$hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
- if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) {
+ if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1;
}
} elseif ($contact['network'] == Protocol::DIASPORA) {
$ret = Diaspora::sendShare($a->user, $contact);
logger('share returns: ' . $ret);
+ } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+ $ret = ActivityPub::transmitActivity('Follow', $contact['url'], $uid);
+ logger('Follow returns: ' . $ret);
}
}
return $contact;
}
- public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
+ public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) {
// Should always be set
if (empty($datarray['author-id'])) {
return;
return;
}
- $url = $pub_contact['url'];
+ $url = defaults($datarray, 'author-link', $pub_contact['url']);
$name = $pub_contact['name'];
$photo = $pub_contact['photo'];
$nick = $pub_contact['nick'];
DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
['id' => $contact['id'], 'uid' => $importer['uid']]);
}
+
+ if ($contact['network'] == Protocol::ACTIVITYPUB) {
+ ActivityPub::transmitContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
+ }
+
// send email notification to owner?
} else {
if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
logger('ignoring duplicated connection request from pending contact ' . $url);
return;
}
-
// create contact record
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
`blocked`, `readonly`, `pending`, `writable`)
* These constants represent the parcel format used to transport a conversation independently of the message protocol.
* It currently is stored in the "protocol" field for legacy reasons.
*/
- const PARCEL_UNKNOWN = 0;
+ const PARCEL_ACTIVITYPUB = 0;
const PARCEL_DFRN = 1;
const PARCEL_DIASPORA = 2;
const PARCEL_SALMON = 3;
const PARCEL_FEED = 4; // Deprecated
const PARCEL_SPLIT_CONVERSATION = 6;
const PARCEL_TWITTER = 67;
+ const PARCEL_UNKNOWN = 255;
/**
* @brief Store the conversation data
public static function insert(array $arr)
{
if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
- [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
+ [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
$conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
unset($old_conv['source']);
}
// Update structure data all the time but the source only when its from a better protocol.
- if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+ if (empty($conversation['source']) || (!empty($old_conv['source']) &&
+ ($old_conv['protocol'] < defaults($conversation, 'protocol', PARCEL_UNKNOWN)))) {
unset($conversation['protocol']);
unset($conversation['source']);
}
// We can always comment on posts from these networks
if (array_key_exists('writable', $row) &&
- in_array($row['internal-network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ in_array($row['internal-network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
$row['writable'] = true;
}
DBA::delete('item-delivery-data', ['iid' => $item['id']]);
- if (!empty($item['iaid']) && !self::exists(['iaid' => $item['iaid'], 'deleted' => false])) {
- DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
- }
+ //if (!empty($item['iaid']) && !self::exists(['iaid' => $item['iaid'], 'deleted' => false])) {
+ // DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
+ //}
if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) {
DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
}
* We have to check several networks since Friendica posts could be repeated
* via OStatus (maybe Diasporsa as well)
*/
- if (in_array($item['network'], [Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
+ if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
$condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
trim($item['uri']), $item['uid'],
Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS];
// Only distribute public items from native networks
$condition = ['id' => $itemid, 'uid' => 0,
- 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
+ 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (!DBA::isResult($item)) {
$users = [];
- $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
- $parent['owner-id'], Contact::SHARING, Contact::FRIEND];
+ /// @todo add a field "pcid" in the contact table that referrs to the public contact id.
+ $owner = DBA::selectFirst('contact', ['url', 'nurl', 'alias'], ['id' => $parent['owner-id']]);
+ if (!DBA::isResult($owner)) {
+ return;
+ }
+ $condition = ['nurl' => $owner['nurl'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
$contacts = DBA::select('contact', ['uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] == 0) {
+ continue;
+ }
+ $users[$contact['uid']] = $contact['uid'];
+ }
+ DBA::close($contacts);
+
+ $condition = ['alias' => $owner['url'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+ $contacts = DBA::select('contact', ['uid'], $condition);
while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] == 0) {
+ continue;
+ }
+
$users[$contact['uid']] = $contact['uid'];
}
+ DBA::close($contacts);
+
+ if (!empty($owner['alias'])) {
+ $condition = ['url' => $owner['alias'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+ $contacts = DBA::select('contact', ['uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] == 0) {
+ continue;
+ }
+
+ $users[$contact['uid']] = $contact['uid'];
+ }
+ DBA::close($contacts);
+ }
$origin_uid = 0;
}
// is it an entry from a connector? Only add an entry for natively connected networks
- if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+ if (!in_array($item["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
return;
}
$guid = System::createGUID(32);
}
- $hostname = self::getApp()->get_hostname();
-
- $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
-
- $uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
-
- return $uri;
+ return self::getApp()->get_baseurl() . '/object/' . $guid;
}
/**
}
// returns an array of contact-ids that are allowed to see this object
- private static function enumeratePermissions($obj)
+ public static function enumeratePermissions($obj)
{
$allow_people = expand_acl($obj['allow_cid']);
$allow_groups = Group::expand(expand_acl($obj['allow_gid']));
class Profile
{
+ /**
+ * @brief Returns default profile for a given user id
+ *
+ * @param integer User ID
+ *
+ * @return array Profile data
+ */
+ public static function getProfileForUser($uid)
+ {
+ $profile = DBA::selectFirst('profile', [], ['uid' => $uid, 'is-default' => true]);
+ return $profile;
+ }
+
/**
* @brief Returns a formatted location string from the given profile array
*
return $tag_text;
}
+ public static function tagArrayFromItemId($itemid)
+ {
+ $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]];
+ $tags = DBA::select('term', ['type', 'term', 'url'], $condition);
+ if (!DBA::isResult($tags)) {
+ return [];
+ }
+
+ return DBA::toArray($tags);
+ }
+
public static function fileTextFromItemId($itemid)
{
$file_text = '';
--- /dev/null
+<?php
+/**
+ * @file src/Module/Followers.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Model\User;
+
+/**
+ * ActivityPub Followers
+ */
+class Followers extends BaseModule
+{
+ public static function init()
+ {
+ $a = self::getApp();
+
+ if (empty($a->argv[1])) {
+ System::httpExit(404);
+ }
+
+ $owner = User::getOwnerDataByNick($a->argv[1]);
+ if (empty($owner)) {
+ System::httpExit(404);
+ }
+
+ $page = defaults($_REQUEST, 'page', null);
+
+ $followers = ActivityPub::getFollowers($owner, $page);
+
+ header('Content-Type: application/activity+json');
+ echo json_encode($followers);
+ exit();
+ }
+}
--- /dev/null
+<?php
+/**
+ * @file src/Module/Following.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Model\User;
+
+/**
+ * ActivityPub Following
+ */
+class Following extends BaseModule
+{
+ public static function init()
+ {
+ $a = self::getApp();
+
+ if (empty($a->argv[1])) {
+ System::httpExit(404);
+ }
+
+ $owner = User::getOwnerDataByNick($a->argv[1]);
+ if (empty($owner)) {
+ System::httpExit(404);
+ }
+
+ $page = defaults($_REQUEST, 'page', null);
+
+ $Following = ActivityPub::getFollowing($owner, $page);
+
+ header('Content-Type: application/activity+json');
+ echo json_encode($Following);
+ exit();
+ }
+}
--- /dev/null
+<?php
+/**
+ * @file src/Module/Inbox.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Util\HTTPSignature;
+
+/**
+ * ActivityPub Inbox
+ */
+class Inbox extends BaseModule
+{
+ public static function init()
+ {
+ $a = self::getApp();
+
+ $postdata = file_get_contents('php://input');
+
+ if (empty($postdata)) {
+ System::httpExit(400);
+ }
+
+// Enable for test purposes
+/*
+ if (HTTPSignature::getSigner($postdata, $_SERVER)) {
+ $filename = 'signed-activitypub';
+ } else {
+ $filename = 'failed-activitypub';
+ }
+
+ $tempfile = tempnam(get_temppath(), $filename);
+ file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+
+ logger('Incoming message stored under ' . $tempfile);
+*/
+ if (!empty($a->argv[1])) {
+ $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+ if (!DBA::isResult($user)) {
+ System::httpExit(404);
+ }
+ $uid = $user['uid'];
+ } else {
+ $uid = 0;
+ }
+
+ ActivityPub::processInbox($postdata, $_SERVER, $uid);
+
+ System::httpExit(202);
+ }
+}
// Create a header that is signed with the local users private key.
$headers = HTTPSignature::createSig(
- '',
$headers,
$user['prvkey'],
- 'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''),
- false,
- true,
- 'sha512'
+ 'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : '')
);
// Try to get an authentication token from the other instance.
--- /dev/null
+<?php
+/**
+ * @file src/Module/Outbox.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Model\User;
+
+/**
+ * ActivityPub Outbox
+ */
+class Outbox extends BaseModule
+{
+ public static function init()
+ {
+ $a = self::getApp();
+
+ if (empty($a->argv[1])) {
+ System::httpExit(404);
+ }
+
+ $owner = User::getOwnerDataByNick($a->argv[1]);
+ if (empty($owner)) {
+ System::httpExit(404);
+ }
+
+ $page = defaults($_REQUEST, 'page', null);
+
+ $Outbox = ActivityPub::getOutbox($owner, $page);
+
+ header('Content-Type: application/activity+json');
+ echo json_encode($Outbox);
+ exit();
+ }
+}
if (DBA::isResult($contact)) {
// Try to verify the signed header with the public key of the contact record
// we have found.
- $verified = HTTPSignature::verify('', $contact['pubkey']);
+ $verified = HTTPSignature:verifyMagic($contact['pubkey']);
if ($verified && $verified['header_signed'] && $verified['header_valid']) {
logger('OWA header: ' . print_r($verified, true), LOGGER_DATA);
use Friendica\Model\Profile;
use Friendica\Protocol\Email;
use Friendica\Protocol\Feed;
+use Friendica\Protocol\ActivityPub;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
$uid = local_user();
}
- $data = self::detect($uri, $network, $uid);
+ if ($network != Protocol::ACTIVITYPUB) {
+ $data = self::detect($uri, $network, $uid);
+ } else {
+ $data = null;
+ }
+
+ $ap_profile = ActivityPub::probeProfile($uri);
+
+ if (!empty($ap_profile) && (defaults($data, 'network', '') != Protocol::DFRN)) {
+ if (!empty($ap_profile) && ($ap_profile['network'] == Protocol::ACTIVITYPUB)) {
+ $data = $ap_profile;
+ }
+ }
if (!isset($data["url"])) {
$data["url"] = $uri;
$owner_name_e = $this->getOwnerName();
// Disable features that aren't available in several networks
- if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA]) && isset($buttons["dislike"])) {
+ if (!in_array($item["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA]) && isset($buttons["dislike"])) {
unset($buttons["dislike"]);
$isevent = false;
$tagger = '';
--- /dev/null
+<?php
+/**
+ * @file src/Protocol/ActivityPub.php
+ */
+namespace Friendica\Protocol;
+
+use Friendica\Database\DBA;
+use Friendica\Core\System;
+use Friendica\BaseObject;
+use Friendica\Util\Network;
+use Friendica\Util\HTTPSignature;
+use Friendica\Core\Protocol;
+use Friendica\Model\Conversation;
+use Friendica\Model\Contact;
+use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Model\Term;
+use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Crypto;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Util\JsonLD;
+use Friendica\Util\LDSignature;
+use Friendica\Core\Config;
+
+/**
+ * @brief ActivityPub Protocol class
+ * The ActivityPub Protocol is a message exchange protocol defined by the W3C.
+ * https://www.w3.org/TR/activitypub/
+ * https://www.w3.org/TR/activitystreams-core/
+ * https://www.w3.org/TR/activitystreams-vocabulary/
+ *
+ * https://blog.joinmastodon.org/2018/06/how-to-implement-a-basic-activitypub-server/
+ * https://blog.joinmastodon.org/2018/07/how-to-make-friends-and-verify-requests/
+ *
+ * Digest: https://tools.ietf.org/html/rfc5843
+ * https://tools.ietf.org/html/draft-cavage-http-signatures-10#ref-15
+ *
+ * Mastodon implementation of supported activities:
+ * https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/activity.rb#L26
+ *
+ * To-do:
+ *
+ * Receiver:
+ * - Update Note
+ * - Delete Note
+ * - Delete Person
+ * - Undo Announce
+ * - Reject Follow
+ * - Undo Accept
+ * - Undo Follow
+ * - Add
+ * - Create Image
+ * - Create Video
+ * - Event
+ * - Remove
+ * - Block
+ * - Flag
+ *
+ * Transmitter:
+ * - Announce
+ * - Undo Announce
+ * - Update Person
+ * - Reject Follow
+ * - Event
+ *
+ * General:
+ * - Queueing unsucessful deliveries
+ * - Polling the outboxes for missing content?
+ * - Checking signature fails
+ * - Possibly using the LD-JSON parser
+ */
+class ActivityPub
+{
+ const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
+ const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+ ['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
+ 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
+ 'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
+ 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']];
+
+ public static function isRequest()
+ {
+ return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
+ stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
+ }
+
+ public static function getFollowers($owner, $page = null)
+ {
+ $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+ 'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+ $count = DBA::count('contact', $condition);
+
+ $data = ['@context' => self::CONTEXT];
+ $data['id'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+ $data['type'] = 'OrderedCollection';
+ $data['totalItems'] = $count;
+
+ // When we hide our friends we will only show the pure number but don't allow more.
+ $profile = Profile::getProfileForUser($owner['uid']);
+ if (!empty($profile['hide-friends'])) {
+ return $data;
+ }
+
+ if (empty($page)) {
+ $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
+ } else {
+ $list = [];
+
+ $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+ while ($contact = DBA::fetch($contacts)) {
+ $list[] = $contact['url'];
+ }
+
+ if (!empty($list)) {
+ $data['next'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
+ }
+
+ $data['partOf'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+
+ $data['orderedItems'] = $list;
+ }
+
+ return $data;
+ }
+
+ public static function getFollowing($owner, $page = null)
+ {
+ $condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+ 'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+ $count = DBA::count('contact', $condition);
+
+ $data = ['@context' => self::CONTEXT];
+ $data['id'] = System::baseUrl() . '/following/' . $owner['nickname'];
+ $data['type'] = 'OrderedCollection';
+ $data['totalItems'] = $count;
+
+ // When we hide our friends we will only show the pure number but don't allow more.
+ $profile = Profile::getProfileForUser($owner['uid']);
+ if (!empty($profile['hide-friends'])) {
+ return $data;
+ }
+
+ if (empty($page)) {
+ $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
+ } else {
+ $list = [];
+
+ $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+ while ($contact = DBA::fetch($contacts)) {
+ $list[] = $contact['url'];
+ }
+
+ if (!empty($list)) {
+ $data['next'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
+ }
+
+ $data['partOf'] = System::baseUrl() . '/following/' . $owner['nickname'];
+
+ $data['orderedItems'] = $list;
+ }
+
+ return $data;
+ }
+
+ public static function getOutbox($owner, $page = null)
+ {
+ $public_contact = Contact::getIdForURL($owner['url'], 0, true);
+
+ $condition = ['uid' => $owner['uid'], 'contact-id' => $owner['id'], 'author-id' => $public_contact,
+ 'wall' => true, 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+ 'deleted' => false, 'visible' => true];
+ $count = DBA::count('item', $condition);
+
+ $data = ['@context' => self::CONTEXT];
+ $data['id'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+ $data['type'] = 'OrderedCollection';
+ $data['totalItems'] = $count;
+
+ if (empty($page)) {
+ $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
+ } else {
+ $list = [];
+
+ $condition['parent-network'] = Protocol::NATIVE_SUPPORT;
+
+ $items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
+ while ($item = Item::fetch($items)) {
+ $object = self::createObjectFromItemID($item['id']);
+ unset($object['@context']);
+ $list[] = $object;
+ }
+
+ if (!empty($list)) {
+ $data['next'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
+ }
+
+ $data['partOf'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+
+ $data['orderedItems'] = $list;
+ }
+
+ return $data;
+ }
+
+ /**
+ * Return the ActivityPub profile of the given user
+ *
+ * @param integer $uid User ID
+ * @return array
+ */
+ public static function profile($uid)
+ {
+ $accounttype = ['Person', 'Organization', 'Service', 'Group', 'Application'];
+ $condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
+ 'account_removed' => false, 'verified' => true];
+ $fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
+ $user = DBA::selectFirst('user', $fields, $condition);
+ if (!DBA::isResult($user)) {
+ return [];
+ }
+
+ $fields = ['locality', 'region', 'country-name'];
+ $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ if (!DBA::isResult($profile)) {
+ return [];
+ }
+
+ $fields = ['name', 'url', 'location', 'about', 'avatar'];
+ $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+ if (!DBA::isResult($contact)) {
+ return [];
+ }
+
+ $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+ ['vcard' => 'http://www.w3.org/2006/vcard/ns#', 'uuid' => 'http://schema.org/identifier',
+ 'sensitive' => 'as:sensitive', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers']]];
+
+ $data['id'] = $contact['url'];
+ $data['uuid'] = $user['guid'];
+ $data['type'] = $accounttype[$user['account-type']];
+ $data['following'] = System::baseUrl() . '/following/' . $user['nickname'];
+ $data['followers'] = System::baseUrl() . '/followers/' . $user['nickname'];
+ $data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname'];
+ $data['outbox'] = System::baseUrl() . '/outbox/' . $user['nickname'];
+ $data['preferredUsername'] = $user['nickname'];
+ $data['name'] = $contact['name'];
+ $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
+ 'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
+ $data['summary'] = $contact['about'];
+ $data['url'] = $contact['url'];
+ $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP]);
+ $data['publicKey'] = ['id' => $contact['url'] . '#main-key',
+ 'owner' => $contact['url'],
+ 'publicKeyPem' => $user['pubkey']];
+ $data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
+ $data['icon'] = ['type' => 'Image',
+ 'url' => $contact['avatar']];
+
+ // tags: https://kitty.town/@inmysocks/100656097926961126.json
+ return $data;
+ }
+
+ private static function fetchPermissionBlockFromConversation($item)
+ {
+ if (empty($item['thr-parent'])) {
+ return [];
+ }
+
+ $condition = ['item-uri' => $item['thr-parent'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+ $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+ if (!DBA::isResult($conversation)) {
+ return [];
+ }
+
+ $activity = json_decode($conversation['source'], true);
+
+ $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+ $profile = ActivityPub::fetchprofile($actor);
+
+ $item_profile = ActivityPub::fetchprofile($item['author-link']);
+ $exclude[] = $item['author-link'];
+
+ if ($item['gravity'] == GRAVITY_PARENT) {
+ $exclude[] = $item['owner-link'];
+ }
+
+ $permissions['to'][] = $actor;
+
+ $elements = ['to', 'cc', 'bto', 'bcc'];
+ foreach ($elements as $element) {
+ if (empty($activity[$element])) {
+ continue;
+ }
+ if (is_string($activity[$element])) {
+ $activity[$element] = [$activity[$element]];
+ }
+
+ foreach ($activity[$element] as $receiver) {
+ if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
+ $receiver = $item_profile['followers'];
+ }
+ if (!in_array($receiver, $exclude)) {
+ $permissions[$element][] = $receiver;
+ }
+ }
+ }
+ return $permissions;
+ }
+
+ public static function createPermissionBlockForItem($item)
+ {
+ $data = ['to' => [], 'cc' => []];
+
+ $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+
+ $actor_profile = ActivityPub::fetchprofile($item['author-link']);
+
+ $terms = Term::tagArrayFromItemId($item['id']);
+
+ $contacts[$item['author-link']] = $item['author-link'];
+
+ if (!$item['private']) {
+ $data['to'][] = self::PUBLIC;
+ if (!empty($actor_profile['followers'])) {
+ $data['cc'][] = $actor_profile['followers'];
+ }
+
+ foreach ($terms as $term) {
+ if ($term['type'] != TERM_MENTION) {
+ continue;
+ }
+ $profile = self::fetchprofile($term['url'], false);
+ if (!empty($profile) && empty($contacts[$profile['url']])) {
+ $data['cc'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
+ }
+ }
+ } else {
+ $receiver_list = Item::enumeratePermissions($item);
+
+ $mentioned = [];
+
+ foreach ($terms as $term) {
+ if ($term['type'] != TERM_MENTION) {
+ continue;
+ }
+ $cid = Contact::getIdForURL($term['url'], $item['uid']);
+ if (!empty($cid) && in_array($cid, $receiver_list)) {
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
+ $data['to'][] = $contact['url'];
+ $contacts[$contact['url']] = $contact['url'];
+ }
+ }
+
+ foreach ($receiver_list as $receiver) {
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
+ if (empty($contacts[$contact['url']])) {
+ $data['cc'][] = $contact['url'];
+ $contacts[$contact['url']] = $contact['url'];
+ }
+ }
+ }
+
+ $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]);
+ while ($parent = Item::fetch($parents)) {
+ // Don't include data from future posts
+ if ($parent['id'] >= $item['id']) {
+ continue;
+ }
+
+ $profile = self::fetchprofile($parent['author-link'], false);
+ if (!empty($profile) && empty($contacts[$profile['url']])) {
+ $data['cc'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
+ }
+
+ if ($item['gravity'] != GRAVITY_PARENT) {
+ continue;
+ }
+
+ $profile = self::fetchprofile($parent['owner-link'], false);
+ if (!empty($profile) && empty($contacts[$profile['url']])) {
+ $data['cc'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
+ }
+ }
+ DBA::close($parents);
+
+ if (empty($data['to'])) {
+ $data['to'] = $data['cc'];
+ $data['cc'] = [];
+ }
+
+ return $data;
+ }
+
+ public static function fetchTargetInboxes($item, $uid)
+ {
+ $permissions = self::createPermissionBlockForItem($item);
+ if (empty($permissions)) {
+ return [];
+ }
+
+ $inboxes = [];
+
+ if ($item['gravity'] == GRAVITY_ACTIVITY) {
+ $item_profile = ActivityPub::fetchprofile($item['author-link']);
+ } else {
+ $item_profile = ActivityPub::fetchprofile($item['owner-link']);
+ }
+
+ $elements = ['to', 'cc', 'bto', 'bcc'];
+ foreach ($elements as $element) {
+ if (empty($permissions[$element])) {
+ continue;
+ }
+
+ foreach ($permissions[$element] as $receiver) {
+ if ($receiver == $item_profile['followers']) {
+ $contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $uid,
+ 'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
+ while ($contact = DBA::fetch($contacts)) {
+ $contact = defaults($contact, 'batch', $contact['notify']);
+ $inboxes[$contact] = $contact;
+ }
+ DBA::close($contacts);
+ } else {
+ $profile = self::fetchprofile($receiver);
+ if (!empty($profile)) {
+ $target = defaults($profile, 'sharedinbox', $profile['inbox']);
+ $inboxes[$target] = $target;
+ }
+ }
+ }
+ }
+
+ return $inboxes;
+ }
+
+ public static function getTypeOfItem($item)
+ {
+ if ($item['verb'] == ACTIVITY_POST) {
+ if ($item['created'] == $item['edited']) {
+ $type = 'Create';
+ } else {
+ $type = 'Update';
+ }
+ } elseif ($item['verb'] == ACTIVITY_LIKE) {
+ $type = 'Like';
+ } elseif ($item['verb'] == ACTIVITY_DISLIKE) {
+ $type = 'Dislike';
+ } elseif ($item['verb'] == ACTIVITY_ATTEND) {
+ $type = 'Accept';
+ } elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
+ $type = 'Reject';
+ } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
+ $type = 'TentativeAccept';
+ } else {
+ $type = '';
+ }
+
+ return $type;
+ }
+
+ public static function createActivityFromItem($item_id, $object_mode = false)
+ {
+ $item = Item::selectFirst([], ['id' => $item_id]);
+
+ if (!DBA::isResult($item)) {
+ return false;
+ }
+
+ $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+ $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+ if (DBA::isResult($conversation)) {
+ $data = json_decode($conversation['source']);
+ if (!empty($data)) {
+ return $data;
+ }
+ }
+
+ $type = self::getTypeOfItem($item);
+
+ if (!$object_mode) {
+ $data = ['@context' => self::CONTEXT];
+
+ if ($item['deleted'] && ($item['gravity'] == GRAVITY_ACTIVITY)) {
+ $type = 'Undo';
+ } elseif ($item['deleted']) {
+ $type = 'Delete';
+ }
+ } else {
+ $data = [];
+ }
+
+ $data['id'] = $item['uri'] . '#' . $type;
+ $data['type'] = $type;
+ $data['actor'] = $item['author-link'];
+
+ $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+
+ if ($item["created"] != $item["edited"]) {
+ $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
+ }
+
+ $data['context'] = self::createConversationURLFromItem($item);
+
+ $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
+
+ if (in_array($data['type'], ['Create', 'Update', 'Announce', 'Delete'])) {
+ $data['object'] = self::CreateNote($item);
+ } elseif ($data['type'] == 'Undo') {
+ $data['object'] = self::createActivityFromItem($item_id, true);
+ } else {
+ $data['object'] = $item['thr-parent'];
+ }
+
+ $owner = User::getOwnerDataById($item['uid']);
+
+ if (!$object_mode) {
+ return LDSignature::sign($data, $owner);
+ } else {
+ return $data;
+ }
+ }
+
+ public static function createObjectFromItemID($item_id)
+ {
+ $item = Item::selectFirst([], ['id' => $item_id]);
+
+ if (!DBA::isResult($item)) {
+ return false;
+ }
+
+ $data = ['@context' => self::CONTEXT];
+ $data = array_merge($data, self::CreateNote($item));
+
+ return $data;
+ }
+
+ private static function createTagList($item)
+ {
+ $tags = [];
+
+ $terms = Term::tagArrayFromItemId($item['id']);
+ foreach ($terms as $term) {
+ if ($term['type'] == TERM_MENTION) {
+ $contact = Contact::getDetailsByURL($term['url']);
+ if (!empty($contact['addr'])) {
+ $mention = '@' . $contact['addr'];
+ } else {
+ $mention = '@' . $term['url'];
+ }
+
+ $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
+ }
+ }
+ return $tags;
+ }
+
+ private static function createConversationURLFromItem($item)
+ {
+ $conversation = DBA::selectFirst('conversation', ['conversation-uri'], ['item-uri' => $item['parent-uri']]);
+ if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
+ $conversation_uri = $conversation['conversation-uri'];
+ } else {
+ $conversation_uri = $item['parent-uri'];
+ }
+ return $conversation_uri;
+ }
+
+ private static function CreateNote($item)
+ {
+ if (!empty($item['title'])) {
+ $type = 'Article';
+ } else {
+ $type = 'Note';
+ }
+
+ if ($item['deleted']) {
+ $type = 'Tombstone';
+ }
+
+ $data = [];
+ $data['id'] = $item['uri'];
+ $data['type'] = $type;
+
+ if ($item['deleted']) {
+ return $data;
+ }
+
+ $data['summary'] = null; // Ignore by now
+
+ if ($item['uri'] != $item['thr-parent']) {
+ $data['inReplyTo'] = $item['thr-parent'];
+ } else {
+ $data['inReplyTo'] = null;
+ }
+
+ $data['uuid'] = $item['guid'];
+ $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+
+ if ($item["created"] != $item["edited"]) {
+ $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
+ }
+
+ $data['url'] = $item['plink'];
+ $data['attributedTo'] = $item['author-link'];
+ $data['actor'] = $item['author-link'];
+ $data['sensitive'] = false; // - Query NSFW
+ $data['conversation'] = $data['context'] = self::createConversationURLFromItem($item);
+
+ if (!empty($item['title'])) {
+ $data['name'] = BBCode::convert($item['title'], false, 7);
+ }
+
+ $data['content'] = BBCode::convert($item['body'], false, 7);
+ $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
+ $data['attachment'] = []; // @ToDo
+ $data['tag'] = self::createTagList($item);
+ $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
+
+ //$data['emoji'] = []; // Ignore by now
+ return $data;
+ }
+
+ public static function transmitActivity($activity, $target, $uid)
+ {
+ $profile = self::fetchprofile($target);
+
+ $owner = User::getOwnerDataById($uid);
+
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => $activity,
+ 'actor' => $owner['url'],
+ 'object' => $profile['url'],
+ 'to' => $profile['url']];
+
+ logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
+
+ $signed = LDSignature::sign($data, $owner);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ }
+
+ public static function transmitContactAccept($target, $id, $uid)
+ {
+ $profile = self::fetchprofile($target);
+
+ $owner = User::getOwnerDataById($uid);
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => 'Accept',
+ 'actor' => $owner['url'],
+ 'object' => ['id' => $id, 'type' => 'Follow',
+ 'actor' => $profile['url'],
+ 'object' => $owner['url']],
+ 'to' => $profile['url']];
+
+ logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+ $signed = LDSignature::sign($data, $owner);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ }
+
+ public static function transmitContactReject($target, $id, $uid)
+ {
+ $profile = self::fetchprofile($target);
+
+ $owner = User::getOwnerDataById($uid);
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => 'Reject',
+ 'actor' => $owner['url'],
+ 'object' => ['id' => $id, 'type' => 'Follow',
+ 'actor' => $profile['url'],
+ 'object' => $owner['url']],
+ 'to' => $profile['url']];
+
+ logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+ $signed = LDSignature::sign($data, $owner);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ }
+
+ public static function transmitContactUndo($target, $uid)
+ {
+ $profile = self::fetchprofile($target);
+
+ $id = System::baseUrl() . '/activity/' . System::createGUID();
+
+ $owner = User::getOwnerDataById($uid);
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => $id,
+ 'type' => 'Undo',
+ 'actor' => $owner['url'],
+ 'object' => ['id' => $id, 'type' => 'Follow',
+ 'actor' => $owner['url'],
+ 'object' => $profile['url']],
+ 'to' => $profile['url']];
+
+ logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+ $signed = LDSignature::sign($data, $owner);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ }
+
+ /**
+ * Fetches ActivityPub content from the given url
+ *
+ * @param string $url content url
+ * @return array
+ */
+ public static function fetchContent($url)
+ {
+ $ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
+ if (!$ret['success'] || empty($ret['body'])) {
+ return;
+ }
+ return json_decode($ret['body'], true);
+ }
+
+ /**
+ * Resolves the profile url from the address by using webfinger
+ *
+ * @param string $addr profile address (user@domain.tld)
+ * @return string url
+ */
+ private static function addrToUrl($addr)
+ {
+ $addr_parts = explode('@', $addr);
+ if (count($addr_parts) != 2) {
+ return false;
+ }
+
+ $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
+
+ $ret = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
+ if (!$ret['success'] || empty($ret['body'])) {
+ return false;
+ }
+
+ $data = json_decode($ret['body'], true);
+
+ if (empty($data['links'])) {
+ return false;
+ }
+
+ foreach ($data['links'] as $link) {
+ if (empty($link['href']) || empty($link['rel']) || empty($link['type'])) {
+ continue;
+ }
+
+ if (($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
+ return $link['href'];
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Fetches a profile form a given url
+ *
+ * @param string $url profile url
+ * @param boolean $update true = always update, false = never update, null = update when not found
+ * @return array profile array
+ */
+ public static function fetchprofile($url, $update = null)
+ {
+ if (empty($url)) {
+ return false;
+ }
+
+ if (empty($update)) {
+ $apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
+ if (DBA::isResult($apcontact)) {
+ return $apcontact;
+ }
+
+ $apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
+ if (DBA::isResult($apcontact)) {
+ return $apcontact;
+ }
+
+ $apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
+ if (DBA::isResult($apcontact)) {
+ return $apcontact;
+ }
+
+ if (!is_null($update)) {
+ return false;
+ }
+ }
+
+ if (empty(parse_url($url, PHP_URL_SCHEME))) {
+ $url = self::addrToUrl($url);
+ if (empty($url)) {
+ return false;
+ }
+ }
+
+ $data = self::fetchContent($url);
+
+ if (empty($data) || empty($data['id']) || empty($data['inbox'])) {
+ return false;
+ }
+
+ $apcontact = [];
+ $apcontact['url'] = $data['id'];
+ $apcontact['uuid'] = defaults($data, 'uuid', null);
+ $apcontact['type'] = defaults($data, 'type', null);
+ $apcontact['following'] = defaults($data, 'following', null);
+ $apcontact['followers'] = defaults($data, 'followers', null);
+ $apcontact['inbox'] = defaults($data, 'inbox', null);
+ $apcontact['outbox'] = defaults($data, 'outbox', null);
+ $apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox');
+ $apcontact['nick'] = defaults($data, 'preferredUsername', null);
+ $apcontact['name'] = defaults($data, 'name', $apcontact['nick']);
+ $apcontact['about'] = defaults($data, 'summary', '');
+ $apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url');
+ $apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href');
+
+ $parts = parse_url($apcontact['url']);
+ unset($parts['scheme']);
+ unset($parts['path']);
+ $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
+
+ $apcontact['pubkey'] = trim(JsonLD::fetchElement($data, 'publicKey', 'publicKeyPem'));
+
+ // To-Do
+ // manuallyApprovesFollowers
+
+ // Unhandled
+ // @context, tag, attachment, image, nomadicLocations, signature, following, followers, featured, movedTo, liked
+
+ // Unhandled from Misskey
+ // sharedInbox, isCat
+
+ // Unhandled from Kroeg
+ // kroeg:blocks, updated
+
+ // Check if the address is resolvable
+ if (self::addrToUrl($apcontact['addr']) == $apcontact['url']) {
+ $parts = parse_url($apcontact['url']);
+ unset($parts['path']);
+ $apcontact['baseurl'] = Network::unparseURL($parts);
+ } else {
+ $apcontact['addr'] = null;
+ }
+
+ if ($apcontact['url'] == $apcontact['alias']) {
+ $apcontact['alias'] = null;
+ }
+
+ $apcontact['updated'] = DateTimeFormat::utcNow();
+
+ DBA::update('apcontact', $apcontact, ['url' => $url], true);
+
+ // Update some data in the contact table with various ways to catch them all
+ $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']];
+ DBA::update('contact', $contact_fields, ['nurl' => normalise_link($url)]);
+
+ $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => normalise_link($url)]);
+ while ($contact = DBA::fetch($contacts)) {
+ Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']);
+ }
+ DBA::close($contacts);
+
+ // Update the gcontact table
+ DBA::update('gcontact', $contact_fields, ['nurl' => normalise_link($url)]);
+
+ return $apcontact;
+ }
+
+ /**
+ * Fetches a profile from the given url into an array that is compatible to Probe::uri
+ *
+ * @param string $url profile url
+ * @return array
+ */
+ public static function probeProfile($url)
+ {
+ $apcontact = self::fetchprofile($url, true);
+ if (empty($apcontact)) {
+ return false;
+ }
+
+ $profile = ['network' => Protocol::ACTIVITYPUB];
+ $profile['nick'] = $apcontact['nick'];
+ $profile['name'] = $apcontact['name'];
+ $profile['guid'] = $apcontact['uuid'];
+ $profile['url'] = $apcontact['url'];
+ $profile['addr'] = $apcontact['addr'];
+ $profile['alias'] = $apcontact['alias'];
+ $profile['photo'] = $apcontact['photo'];
+ // $profile['community']
+ // $profile['keywords']
+ // $profile['location']
+ $profile['about'] = $apcontact['about'];
+ $profile['batch'] = $apcontact['sharedinbox'];
+ $profile['notify'] = $apcontact['inbox'];
+ $profile['poll'] = $apcontact['outbox'];
+ $profile['pubkey'] = $apcontact['pubkey'];
+ $profile['baseurl'] = $apcontact['baseurl'];
+
+ // Remove all "null" fields
+ foreach ($profile as $field => $content) {
+ if (is_null($content)) {
+ unset($profile[$field]);
+ }
+ }
+
+ return $profile;
+ }
+
+ public static function processInbox($body, $header, $uid)
+ {
+ $http_signer = HTTPSignature::getSigner($body, $header);
+ if (empty($http_signer)) {
+ logger('Invalid HTTP signature, message will be discarded.', LOGGER_DEBUG);
+ return;
+ } else {
+ logger('HTTP signature is signed by ' . $http_signer, LOGGER_DEBUG);
+ }
+
+ $activity = json_decode($body, true);
+
+ $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+ logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
+
+ if (empty($activity)) {
+ logger('Invalid body.', LOGGER_DEBUG);
+ return;
+ }
+
+ if (LDSignature::isSigned($activity)) {
+ $ld_signer = LDSignature::getSigner($activity);
+ if (!empty($ld_signer && ($actor == $http_signer))) {
+ logger('The HTTP and the JSON-LD signature belong to ' . $ld_signer, LOGGER_DEBUG);
+ $trust_source = true;
+ } elseif (!empty($ld_signer)) {
+ logger('JSON-LD signature is signed by ' . $ld_signer, LOGGER_DEBUG);
+ $trust_source = true;
+ } elseif ($actor == $http_signer) {
+ logger('Bad JSON-LD signature, but HTTP signer fits the actor.', LOGGER_DEBUG);
+ $trust_source = true;
+ } else {
+ logger('Invalid JSON-LD signature and the HTTP signer is different.', LOGGER_DEBUG);
+ $trust_source = false;
+ }
+ } elseif ($actor == $http_signer) {
+ logger('Trusting post without JSON-LD signature, The actor fits the HTTP signer.', LOGGER_DEBUG);
+ $trust_source = true;
+ } else {
+ logger('No JSON-LD signature, different actor.', LOGGER_DEBUG);
+ $trust_source = false;
+ }
+
+ self::processActivity($activity, $body, $uid, $trust_source);
+ }
+
+ public static function fetchOutbox($url, $uid)
+ {
+ $data = self::fetchContent($url);
+ if (empty($data)) {
+ return;
+ }
+
+ if (!empty($data['orderedItems'])) {
+ $items = $data['orderedItems'];
+ } elseif (!empty($data['first']['orderedItems'])) {
+ $items = $data['first']['orderedItems'];
+ } elseif (!empty($data['first'])) {
+ self::fetchOutbox($data['first'], $uid);
+ return;
+ } else {
+ $items = [];
+ }
+
+ foreach ($items as $activity) {
+ self::processActivity($activity, '', $uid, true);
+ }
+ }
+
+ private static function prepareObjectData($activity, $uid, &$trust_source)
+ {
+ $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+ if (empty($actor)) {
+ logger('Empty actor', LOGGER_DEBUG);
+ return [];
+ }
+
+ // Fetch all receivers from to, cc, bto and bcc
+ $receivers = self::getReceivers($activity, $actor);
+
+ // When it is a delivery to a personal inbox we add that user to the receivers
+ if (!empty($uid)) {
+ $owner = User::getOwnerDataById($uid);
+ $additional = ['uid:' . $uid => $uid];
+ $receivers = array_merge($receivers, $additional);
+ }
+
+ logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
+
+ if (is_string($activity['object'])) {
+ $object_url = $activity['object'];
+ } elseif (!empty($activity['object']['id'])) {
+ $object_url = $activity['object']['id'];
+ } else {
+ logger('No object found', LOGGER_DEBUG);
+ return [];
+ }
+
+ // Fetch the content only on activities where this matters
+ if (in_array($activity['type'], ['Create', 'Announce'])) {
+ $object_data = self::fetchObject($object_url, $activity['object'], $trust_source);
+ if (empty($object_data)) {
+ logger("Object data couldn't be processed", LOGGER_DEBUG);
+ return [];
+ }
+ // We had been able to retrieve the object data - so we can trust the source
+ $trust_source = true;
+ } elseif ($activity['type'] == 'Update') {
+ $object_data = [];
+ $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+ $object_data['object'] = $activity['object'];
+ } elseif ($activity['type'] == 'Accept') {
+ $object_data = [];
+ $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+ $object_data['object'] = JsonLD::fetchElement($activity, 'object', 'actor');
+ } elseif ($activity['type'] == 'Undo') {
+ $object_data = [];
+ $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+ if ($object_data['object_type'] == 'Follow') {
+ $object_data['object'] = JsonLD::fetchElement($activity, 'object', 'object');
+ } else {
+ $object_data['object'] = $activity['object'];
+ }
+ } elseif (in_array($activity['type'], ['Like', 'Dislike'])) {
+ // Create a mostly empty array out of the activity data (instead of the object).
+ // This way we later don't have to check for the existence of ech individual array element.
+ $object_data = self::processCommonData($activity);
+ $object_data['name'] = $activity['type'];
+ $object_data['author'] = $activity['actor'];
+ $object_data['object'] = $object_url;
+ } elseif ($activity['type'] == 'Follow') {
+ $object_data['id'] = $activity['id'];
+ $object_data['object'] = $object_url;
+ } else {
+ $object_data = [];
+ }
+
+ $object_data = self::addActivityFields($object_data, $activity);
+
+ $object_data['type'] = $activity['type'];
+ $object_data['owner'] = $actor;
+ $object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
+
+ return $object_data;
+ }
+
+ private static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
+ {
+ if (empty($activity['type'])) {
+ logger('Empty type', LOGGER_DEBUG);
+ return;
+ }
+
+ if (empty($activity['object'])) {
+ logger('Empty object', LOGGER_DEBUG);
+ return;
+ }
+
+ if (empty($activity['actor'])) {
+ logger('Empty actor', LOGGER_DEBUG);
+ return;
+
+ }
+
+ // Non standard
+ // title, atomUri, context_id, statusnetConversationId
+
+ // To-Do?
+ // context, location, signature;
+
+ logger('Processing activity: ' . $activity['type'], LOGGER_DEBUG);
+
+ // $trust_source is called by reference and is set to true if the content was retrieved successfully
+ $object_data = self::prepareObjectData($activity, $uid, $trust_source);
+ if (empty($object_data)) {
+ logger('No object data found', LOGGER_DEBUG);
+ return;
+ }
+
+ if (!$trust_source) {
+ logger('No trust for activity type "' . $activity['type'] . '", so we quit now.', LOGGER_DEBUG);
+ }
+
+ switch ($activity['type']) {
+ case 'Create':
+ case 'Announce':
+ self::createItem($object_data, $body);
+ break;
+
+ case 'Like':
+ self::likeItem($object_data, $body);
+ break;
+
+ case 'Dislike':
+ self::dislikeItem($object_data, $body);
+ break;
+
+ case 'Update':
+ if (in_array($object_data['object_type'], ['Person', 'Organization', 'Service', 'Group', 'Application'])) {
+ self::updatePerson($object_data, $body);
+ }
+ break;
+
+ case 'Delete':
+ break;
+
+ case 'Follow':
+ self::followUser($object_data);
+ break;
+
+ case 'Accept':
+ if ($object_data['object_type'] == 'Follow') {
+ self::acceptFollowUser($object_data);
+ }
+ break;
+
+ case 'Undo':
+ if ($object_data['object_type'] == 'Follow') {
+ self::undoFollowUser($object_data);
+ } elseif (in_array($object_data['object_type'], ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'])) {
+ self::undoActivity($object_data);
+ }
+ break;
+
+ default:
+ logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
+ break;
+ }
+ }
+
+ private static function getReceivers($activity, $actor)
+ {
+ $receivers = [];
+
+ // When it is an answer, we inherite the receivers from the parent
+ $replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+ if (!empty($replyto)) {
+ $parents = Item::select(['uid'], ['uri' => $replyto]);
+ while ($parent = Item::fetch($parents)) {
+ $receivers['uid:' . $parent['uid']] = $parent['uid'];
+ }
+ }
+
+ if (!empty($actor)) {
+ $profile = self::fetchprofile($actor);
+ $followers = defaults($profile, 'followers', '');
+
+ logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG);
+ } else {
+ logger('Empty actor', LOGGER_DEBUG);
+ $followers = '';
+ }
+
+ $elements = ['to', 'cc', 'bto', 'bcc'];
+ foreach ($elements as $element) {
+ if (empty($activity[$element])) {
+ continue;
+ }
+
+ // The receiver can be an arror or a string
+ if (is_string($activity[$element])) {
+ $activity[$element] = [$activity[$element]];
+ }
+
+ foreach ($activity[$element] as $receiver) {
+ if ($receiver == self::PUBLIC) {
+ $receivers['uid:0'] = 0;
+ }
+
+ if (($receiver == self::PUBLIC) && !empty($actor)) {
+ // This will most likely catch all OStatus connections to Mastodon
+ $condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+ $contacts = DBA::select('contact', ['uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] != 0) {
+ $receivers['uid:' . $contact['uid']] = $contact['uid'];
+ }
+ }
+ DBA::close($contacts);
+ }
+
+ if (in_array($receiver, [$followers, self::PUBLIC]) && !empty($actor)) {
+ $condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
+ 'network' => Protocol::ACTIVITYPUB];
+ $contacts = DBA::select('contact', ['uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ if ($contact['uid'] != 0) {
+ $receivers['uid:' . $contact['uid']] = $contact['uid'];
+ }
+ }
+ DBA::close($contacts);
+ continue;
+ }
+
+ $condition = ['self' => true, 'nurl' => normalise_link($receiver)];
+ $contact = DBA::selectFirst('contact', ['uid'], $condition);
+ if (!DBA::isResult($contact)) {
+ continue;
+ }
+ $receivers['uid:' . $contact['uid']] = $contact['uid'];
+ }
+ }
+
+ self::switchContacts($receivers, $actor);
+
+ return $receivers;
+ }
+
+ private static function switchContact($cid, $uid, $url)
+ {
+ $profile = ActivityPub::probeProfile($url);
+ if (empty($profile)) {
+ return;
+ }
+
+ logger('Switch contact ' . $cid . ' (' . $profile['url'] . ') for user ' . $uid . ' from OStatus to ActivityPub');
+
+ $photo = $profile['photo'];
+ unset($profile['photo']);
+ unset($profile['baseurl']);
+
+ $profile['nurl'] = normalise_link($profile['url']);
+ DBA::update('contact', $profile, ['id' => $cid]);
+
+ Contact::updateAvatar($photo, $uid, $cid);
+ }
+
+ private static function switchContacts($receivers, $actor)
+ {
+ if (empty($actor)) {
+ return;
+ }
+
+ foreach ($receivers as $receiver) {
+ $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'nurl' => normalise_link($actor)]);
+ if (DBA::isResult($contact)) {
+ self::switchContact($contact['id'], $receiver, $actor);
+ }
+
+ $contact = DBA::selectFirst('contact', ['id'], ['uid' => $receiver, 'network' => Protocol::OSTATUS, 'alias' => [normalise_link($actor), $actor]]);
+ if (DBA::isResult($contact)) {
+ self::switchContact($contact['id'], $receiver, $actor);
+ }
+ }
+ }
+
+ private static function addActivityFields($object_data, $activity)
+ {
+ if (!empty($activity['published']) && empty($object_data['published'])) {
+ $object_data['published'] = $activity['published'];
+ }
+
+ if (!empty($activity['updated']) && empty($object_data['updated'])) {
+ $object_data['updated'] = $activity['updated'];
+ }
+
+ if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
+ $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+ }
+
+ if (!empty($activity['instrument'])) {
+ $object_data['service'] = JsonLD::fetchElement($activity, 'instrument', 'name', 'type', 'Service');
+ }
+ return $object_data;
+ }
+
+ private static function fetchObject($object_url, $object = [], $trust_source = false)
+ {
+ if (!$trust_source || is_string($object)) {
+ $data = self::fetchContent($object_url);
+ if (empty($data)) {
+ logger('Empty content for ' . $object_url . ', check if content is available locally.', LOGGER_DEBUG);
+ $data = $object_url;
+ } else {
+ logger('Fetched content for ' . $object_url, LOGGER_DEBUG);
+ }
+ } else {
+ logger('Using original object for url ' . $object_url, LOGGER_DEBUG);
+ $data = $object;
+ }
+
+ if (is_string($data)) {
+ $item = Item::selectFirst([], ['uri' => $data]);
+ if (!DBA::isResult($item)) {
+ logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
+ return false;
+ }
+ logger('Using already stored item for url ' . $object_url, LOGGER_DEBUG);
+ $data = self::CreateNote($item);
+ }
+
+ if (empty($data['type'])) {
+ logger('Empty type', LOGGER_DEBUG);
+ return false;
+ } else {
+ $type = $data['type'];
+ logger('Type ' . $type, LOGGER_DEBUG);
+ }
+
+ if (in_array($type, ['Note', 'Article', 'Video'])) {
+ $common = self::processCommonData($data);
+ }
+
+ switch ($type) {
+ case 'Note':
+ return array_merge($common, self::processNote($data));
+ case 'Article':
+ return array_merge($common, self::processArticle($data));
+ case 'Video':
+ return array_merge($common, self::processVideo($data));
+
+ case 'Announce':
+ if (empty($data['object'])) {
+ return false;
+ }
+ return self::fetchObject($data['object']);
+
+ case 'Person':
+ case 'Tombstone':
+ break;
+
+ default:
+ logger('Unknown object type: ' . $data['type'], LOGGER_DEBUG);
+ break;
+ }
+ }
+
+ private static function processCommonData(&$object)
+ {
+ if (empty($object['id'])) {
+ return false;
+ }
+
+ $object_data = [];
+ $object_data['type'] = $object['type'];
+ $object_data['uri'] = $object['id'];
+
+ if (!empty($object['inReplyTo'])) {
+ $object_data['reply-to-uri'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
+ } else {
+ $object_data['reply-to-uri'] = $object_data['uri'];
+ }
+
+ $object_data['published'] = defaults($object, 'published', null);
+ $object_data['updated'] = defaults($object, 'updated', $object_data['published']);
+
+ if (empty($object_data['published']) && !empty($object_data['updated'])) {
+ $object_data['published'] = $object_data['updated'];
+ }
+
+ $object_data['uuid'] = defaults($object, 'uuid', null);
+ $object_data['owner'] = $object_data['author'] = JsonLD::fetchElement($object, 'attributedTo', 'id');
+ $object_data['context'] = defaults($object, 'context', null);
+ $object_data['conversation'] = defaults($object, 'conversation', null);
+ $object_data['sensitive'] = defaults($object, 'sensitive', null);
+ $object_data['name'] = defaults($object, 'title', null);
+ $object_data['name'] = defaults($object, 'name', $object_data['name']);
+ $object_data['summary'] = defaults($object, 'summary', null);
+ $object_data['content'] = defaults($object, 'content', null);
+ $object_data['source'] = defaults($object, 'source', null);
+ $object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place');
+ $object_data['attachments'] = defaults($object, 'attachment', null);
+ $object_data['tags'] = defaults($object, 'tag', null);
+ $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service');
+ $object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href');
+ $object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
+
+ // Unhandled
+ // @context, type, actor, signature, mediaType, duration, replies, icon
+
+ // Also missing: (Defined in the standard, but currently unused)
+ // audience, preview, endTime, startTime, generator, image
+
+ return $object_data;
+ }
+
+ private static function processNote($object)
+ {
+ $object_data = [];
+
+ // To-Do?
+ // emoji, atomUri, inReplyToAtomUri
+
+ // Unhandled
+ // contentMap, announcement_count, announcements, context_id, likes, like_count
+ // inReplyToStatusId, shares, quoteUrl, statusnetConversationId
+
+ return $object_data;
+ }
+
+ private static function processArticle($object)
+ {
+ $object_data = [];
+
+ return $object_data;
+ }
+
+ private static function processVideo($object)
+ {
+ $object_data = [];
+
+ // To-Do?
+ // category, licence, language, commentsEnabled
+
+ // Unhandled
+ // views, waitTranscoding, state, support, subtitleLanguage
+ // likes, dislikes, shares, comments
+
+ return $object_data;
+ }
+
+ private static function convertMentions($body)
+ {
+ $URLSearchString = "^\[\]";
+ $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#@!])(.*?)\[\/url\]/ism", '$2[url=$1]$3[/url]', $body);
+
+ return $body;
+ }
+
+ private static function constructTagList($tags, $sensitive)
+ {
+ if (empty($tags)) {
+ return '';
+ }
+
+ $tag_text = '';
+ foreach ($tags as $tag) {
+ if (in_array($tag['type'], ['Mention', 'Hashtag'])) {
+ if (!empty($tag_text)) {
+ $tag_text .= ',';
+ }
+
+ if (empty($tag['href'])) {
+ //$tag['href']
+ logger('Blubb!');
+ }
+
+ $tag_text .= substr($tag['name'], 0, 1) . '[url=' . $tag['href'] . ']' . substr($tag['name'], 1) . '[/url]';
+ }
+ }
+
+ /// @todo add nsfw for $sensitive
+
+ return $tag_text;
+ }
+
+ private static function constructAttachList($attachments, $item)
+ {
+ if (empty($attachments)) {
+ return $item;
+ }
+
+ foreach ($attachments as $attach) {
+ $filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
+ if ($filetype == 'image') {
+ $item['body'] .= "\n[img]".$attach['url'].'[/img]';
+ } else {
+ if (!empty($item["attach"])) {
+ $item["attach"] .= ',';
+ } else {
+ $item["attach"] = '';
+ }
+ if (!isset($attach['length'])) {
+ $attach['length'] = "0";
+ }
+ $item["attach"] .= '[attach]href="'.$attach['url'].'" length="'.$attach['length'].'" type="'.$attach['mediaType'].'" title="'.defaults($attach, 'name', '').'"[/attach]';
+ }
+ }
+
+ return $item;
+ }
+
+ private static function createItem($activity, $body)
+ {
+ $item = [];
+ $item['verb'] = ACTIVITY_POST;
+ $item['parent-uri'] = $activity['reply-to-uri'];
+
+ if ($activity['reply-to-uri'] == $activity['uri']) {
+ $item['gravity'] = GRAVITY_PARENT;
+ $item['object-type'] = ACTIVITY_OBJ_NOTE;
+ } else {
+ $item['gravity'] = GRAVITY_COMMENT;
+ $item['object-type'] = ACTIVITY_OBJ_COMMENT;
+ }
+
+ if (($activity['uri'] != $activity['reply-to-uri']) && !Item::exists(['uri' => $activity['reply-to-uri']])) {
+ logger('Parent ' . $activity['reply-to-uri'] . ' not found. Try to refetch it.');
+ self::fetchMissingActivity($activity['reply-to-uri'], $activity);
+ }
+
+ self::postItem($activity, $item, $body);
+ }
+
+ private static function likeItem($activity, $body)
+ {
+ $item = [];
+ $item['verb'] = ACTIVITY_LIKE;
+ $item['parent-uri'] = $activity['object'];
+ $item['gravity'] = GRAVITY_ACTIVITY;
+ $item['object-type'] = ACTIVITY_OBJ_NOTE;
+
+ self::postItem($activity, $item, $body);
+ }
+
+ private static function dislikeItem($activity, $body)
+ {
+ $item = [];
+ $item['verb'] = ACTIVITY_DISLIKE;
+ $item['parent-uri'] = $activity['object'];
+ $item['gravity'] = GRAVITY_ACTIVITY;
+ $item['object-type'] = ACTIVITY_OBJ_NOTE;
+
+ self::postItem($activity, $item, $body);
+ }
+
+ private static function postItem($activity, $item, $body)
+ {
+ /// @todo What to do with $activity['context']?
+ if (empty($activity['author']))
+ logger('Empty author');
+
+ if (empty($activity['owner']))
+ logger('Empty owner');
+
+ $item['network'] = Protocol::ACTIVITYPUB;
+ $item['private'] = !in_array(0, $activity['receiver']);
+ $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
+ $item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
+ $item['uri'] = $activity['uri'];
+ $item['created'] = $activity['published'];
+ $item['edited'] = $activity['updated'];
+ $item['guid'] = $activity['uuid'];
+ $item['title'] = HTML::toBBCode($activity['name']);
+ $item['content-warning'] = HTML::toBBCode($activity['summary']);
+ $item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
+ $item['location'] = $activity['location'];
+ $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
+ $item['app'] = $activity['service'];
+ $item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
+
+ $item = self::constructAttachList($activity['attachments'], $item);
+
+ $source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
+ if (!empty($source)) {
+ $item['body'] = $source;
+ }
+
+ $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
+ $item['source'] = $body;
+ $item['conversation-uri'] = $activity['conversation'];
+
+ foreach ($activity['receiver'] as $receiver) {
+ $item['uid'] = $receiver;
+ $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
+
+ if (($receiver != 0) && empty($item['contact-id'])) {
+ $item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
+ }
+
+ $item_id = Item::insert($item);
+ logger('Storing for user ' . $item['uid'] . ': ' . $item_id);
+ }
+ }
+
+ private static function fetchMissingActivity($url, $child)
+ {
+ if (Config::get('system', 'ostatus_full_threads')) {
+ return;
+ }
+
+ $object = ActivityPub::fetchContent($url);
+ if (empty($object)) {
+ logger('Activity ' . $url . ' was not fetchable, aborting.');
+ return;
+ }
+
+ $activity = [];
+ $activity['@context'] = $object['@context'];
+ unset($object['@context']);
+ $activity['id'] = $object['id'];
+ $activity['to'] = defaults($object, 'to', []);
+ $activity['cc'] = defaults($object, 'cc', []);
+ $activity['actor'] = $child['author'];
+ $activity['object'] = $object;
+ $activity['published'] = $object['published'];
+ $activity['type'] = 'Create';
+
+ self::processActivity($activity);
+ logger('Activity ' . $url . ' had been fetched and processed.');
+ }
+
+ private static function getUserOfObject($object)
+ {
+ $self = DBA::selectFirst('contact', ['uid'], ['nurl' => normalise_link($object), 'self' => true]);
+ if (!DBA::isResult($self)) {
+ return false;
+ } else {
+ return $self['uid'];
+ }
+ }
+
+ private static function followUser($activity)
+ {
+ $uid = self::getUserOfObject($activity['object']);
+ if (empty($uid)) {
+ return;
+ }
+
+ $owner = User::getOwnerDataById($uid);
+
+ $cid = Contact::getIdForURL($activity['owner'], $uid);
+ if (!empty($cid)) {
+ $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+ } else {
+ $contact = false;
+ }
+
+ $item = ['author-id' => Contact::getIdForURL($activity['owner']),
+ 'author-link' => $activity['owner']];
+
+ Contact::addRelationship($owner, $contact, $item);
+ $cid = Contact::getIdForURL($activity['owner'], $uid);
+ if (empty($cid)) {
+ return;
+ }
+
+ $contact = DBA::selectFirst('contact', ['network'], ['id' => $cid]);
+ if ($contact['network'] != Protocol::ACTIVITYPUB) {
+ Contact::updateFromProbe($cid, Protocol::ACTIVITYPUB);
+ }
+
+ DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
+ logger('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
+ }
+
+ private static function updatePerson($activity)
+ {
+ if (empty($activity['object']['id'])) {
+ return;
+ }
+
+ self::fetchprofile($activity['object']['id'], true);
+ }
+
+ private static function acceptFollowUser($activity)
+ {
+ $uid = self::getUserOfObject($activity['object']);
+ if (empty($uid)) {
+ return;
+ }
+
+ $owner = User::getOwnerDataById($uid);
+
+ $cid = Contact::getIdForURL($activity['owner'], $uid);
+ if (empty($cid)) {
+ logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ return;
+ }
+
+ $fields = ['pending' => false];
+
+ $contact = DBA::selectFirst('contact', ['rel'], ['id' => $cid]);
+ if ($contact['rel'] == Contact::FOLLOWER) {
+ $fields['rel'] = Contact::FRIEND;
+ }
+
+ $condition = ['id' => $cid];
+ DBA::update('contact', $fields, $condition);
+ logger('Accept contact request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
+ }
+
+ private static function undoActivity($activity)
+ {
+ $activity_url = JsonLD::fetchElement($activity, 'object', 'id');
+ if (empty($activity_url)) {
+ return;
+ }
+
+ $actor = JsonLD::fetchElement($activity, 'object', 'actor');
+ if (empty($actor)) {
+ return;
+ }
+
+ $author_id = Contact::getIdForURL($actor);
+ if (empty($author_id)) {
+ return;
+ }
+
+ Item::delete(['uri' => $activity_url, 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+ }
+
+ private static function undoFollowUser($activity)
+ {
+ $uid = self::getUserOfObject($activity['object']);
+ if (empty($uid)) {
+ return;
+ }
+
+ $owner = User::getOwnerDataById($uid);
+
+ $cid = Contact::getIdForURL($activity['owner'], $uid);
+ if (empty($cid)) {
+ logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ return;
+ }
+
+ $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
+ return;
+ }
+
+ Contact::removeFollower($owner, $contact);
+ logger('Undo following request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
+ }
+}
if (DBA::isResult($item)) {
return $item["uri"];
} elseif (!$onlyfound) {
- $contact = Contact::getDetailsByAddr($author, 0);
- if (!empty($contact['network'])) {
- $prefix = 'urn:X-' . $contact['network'] . ':';
- } else {
- // This fallback should happen most unlikely
- $prefix = 'urn:X-dspr:';
- }
+ $person = self::personByHandle($author);
- $author_parts = explode('@', $author);
+ $parts = parse_url($person['url']);
+ unset($parts['path']);
+ $host_url = Network::unparseURL($parts);
- return $prefix . $author_parts[1] . ':' . $author_parts[0] . ':'. $guid;
+ return $host_url . '/object/' . $guid;
}
return "";
$server_url = normalise_link(self::detectServer($profile));
}
- if (!in_array($gcontacts[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
+ if (!in_array($gcontacts[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
return false;
}
*/
namespace Friendica\Util;
+use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Database\DBA;
+use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub;
/**
* @brief Implements HTTP Signatures per draft-cavage-http-signatures-07.
*
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Web/HTTPSig.php
*
+ * Other parts of the code for HTTP signing are taken from the Osada project.
+ * https://framagit.org/macgirvin/osada
+ *
* @see https://tools.ietf.org/html/draft-cavage-http-signatures-07
*/
class HTTPSignature
{
- /**
- * @brief RFC5843
- *
- * Disabled until Friendica's ActivityPub implementation
- * is ready.
- *
- * @see https://tools.ietf.org/html/rfc5843
- *
- * @param string $body The value to create the digest for
- * @param boolean $set (optional, default true)
- * If set send a Digest HTTP header
- *
- * @return string The generated digest of $body
- */
-// public static function generateDigest($body, $set = true)
-// {
-// $digest = base64_encode(hash('sha256', $body, true));
-//
-// if($set) {
-// header('Digest: SHA-256=' . $digest);
-// }
-// return $digest;
-// }
-
// See draft-cavage-http-signatures-08
- public static function verify($data, $key = '')
+ public static function verifyMagic($key)
{
- $body = $data;
$headers = null;
$spoofable = false;
$result = [
'signer' => '',
'header_signed' => false,
- 'header_valid' => false,
- 'content_signed' => false,
- 'content_valid' => false
+ 'header_valid' => false
];
// Decide if $data arrived via controller submission or curl.
- if (is_array($data) && $data['header']) {
- if (!$data['success']) {
- return $result;
- }
+ $headers = [];
+ $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
- $h = new HTTPHeaders($data['header']);
- $headers = $h->fetch();
- $body = $data['body'];
- } else {
- $headers = [];
- $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
-
- foreach ($_SERVER as $k => $v) {
- if (strpos($k, 'HTTP_') === 0) {
- $field = str_replace('_', '-', strtolower(substr($k, 5)));
- $headers[$field] = $v;
- }
+ foreach ($_SERVER as $k => $v) {
+ if (strpos($k, 'HTTP_') === 0) {
+ $field = str_replace('_', '-', strtolower(substr($k, 5)));
+ $headers[$field] = $v;
}
}
$sig_block = null;
- if (array_key_exists('signature', $headers)) {
- $sig_block = self::parseSigheader($headers['signature']);
- } elseif (array_key_exists('authorization', $headers)) {
- $sig_block = self::parseSigheader($headers['authorization']);
- }
+ $sig_block = self::parseSigheader($headers['authorization']);
if (!$sig_block) {
logger('no signature provided.');
return $result;
}
- // Warning: This log statement includes binary data
- // logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA);
-
$result['header_signed'] = true;
$signed_headers = $sig_block['headers'];
$signed_data = rtrim($signed_data, "\n");
- $algorithm = null;
- if ($sig_block['algorithm'] === 'rsa-sha256') {
- $algorithm = 'sha256';
- }
- if ($sig_block['algorithm'] === 'rsa-sha512') {
- $algorithm = 'sha512';
- }
+ $algorithm = 'sha512';
if ($key && function_exists($key)) {
$result['signer'] = $sig_block['keyId'];
logger('Got keyID ' . $sig_block['keyId']);
- // We don't use Activity Pub at the moment.
-// if (!$key) {
-// $result['signer'] = $sig_block['keyId'];
-// $key = self::getActivitypubKey($sig_block['keyId']);
-// }
-
if (!$key) {
return $result;
}
$result['header_valid'] = true;
}
- if (in_array('digest', $signed_headers)) {
- $result['content_signed'] = true;
- $digest = explode('=', $headers['digest']);
-
- if ($digest[0] === 'SHA-256') {
- $hashalg = 'sha256';
- }
- if ($digest[0] === 'SHA-512') {
- $hashalg = 'sha512';
- }
-
- // The explode operation will have stripped the '=' padding, so compare against unpadded base64.
- if (rtrim(base64_encode(hash($hashalg, $body, true)), '=') === $digest[1]) {
- $result['content_valid'] = true;
- }
- }
-
- logger('Content_Valid: ' . $result['content_valid']);
-
return $result;
}
- /**
- * Fetch the public key for Activity Pub contact.
- *
- * @param string|int The identifier (contact addr or contact ID).
- * @return string|boolean The public key or false on failure.
- */
- private static function getActivitypubKey($id)
- {
- if (strpos($id, 'acct:') === 0) {
- $contact = DBA::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
- } else {
- $contact = DBA::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
- }
-
- if (DBA::isResult($contact)) {
- return $contact['pubkey'];
- }
-
- if(function_exists('as_fetch')) {
- $r = as_fetch($id);
- }
-
- if ($r) {
- $j = json_decode($r, true);
-
- if (array_key_exists('publicKey', $j) && array_key_exists('publicKeyPem', $j['publicKey'])) {
- if ((array_key_exists('id', $j['publicKey']) && $j['publicKey']['id'] !== $id) && $j['id'] !== $id) {
- return false;
- }
-
- return $j['publicKey']['publicKeyPem'];
- }
- }
-
- return false;
- }
-
/**
* @brief
*
- * @param string $request
* @param array $head
* @param string $prvkey
* @param string $keyid (optional, default 'Key')
- * @param boolean $send_headers (optional, default false)
- * If set send a HTTP header
- * @param boolean $auth (optional, default false)
- * @param string $alg (optional, default 'sha256')
- * @param string $crypt_key (optional, default null)
- * @param string $crypt_algo (optional, default 'aes256ctr')
*
* @return array
*/
- public static function createSig($request, $head, $prvkey, $keyid = 'Key', $send_headers = false, $auth = false, $alg = 'sha256', $crypt_key = null, $crypt_algo = 'aes256ctr')
+ public static function createSig($head, $prvkey, $keyid = 'Key')
{
$return_headers = [];
- if ($alg === 'sha256') {
- $algorithm = 'rsa-sha256';
- }
-
- if ($alg === 'sha512') {
- $algorithm = 'rsa-sha512';
- }
+ $alg = 'sha512';
+ $algorithm = 'rsa-sha512';
- $x = self::sign($request, $head, $prvkey, $alg);
+ $x = self::sign($head, $prvkey, $alg);
$headerval = 'keyId="' . $keyid . '",algorithm="' . $algorithm
. '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
- if ($crypt_key) {
- $x = Crypto::encapsulate($headerval, $crypt_key, $crypt_algo);
- $headerval = 'iv="' . $x['iv'] . '",key="' . $x['key'] . '",alg="' . $x['alg'] . '",data="' . $x['data'] . '"';
- }
-
- if ($auth) {
- $sighead = 'Authorization: Signature ' . $headerval;
- } else {
- $sighead = 'Signature: ' . $headerval;
- }
+ $sighead = 'Authorization: Signature ' . $headerval;
if ($head) {
foreach ($head as $k => $v) {
- if ($send_headers) {
- // This is for ActivityPub implementation.
- // Since the Activity Pub implementation isn't
- // ready at the moment, we comment it out.
- // header($k . ': ' . $v);
- } else {
- $return_headers[] = $k . ': ' . $v;
- }
+ $return_headers[] = $k . ': ' . $v;
}
}
- if ($send_headers) {
- // This is for ActivityPub implementation.
- // Since the Activity Pub implementation isn't
- // ready at the moment, we comment it out.
- // header($sighead);
- } else {
- $return_headers[] = $sighead;
- }
+ $return_headers[] = $sighead;
return $return_headers;
}
/**
* @brief
*
- * @param string $request
* @param array $head
* @param string $prvkey
* @param string $alg (optional) default 'sha256'
*
* @return array
*/
- private static function sign($request, $head, $prvkey, $alg = 'sha256')
+ private static function sign($head, $prvkey, $alg = 'sha256')
{
$ret = [];
$headers = '';
$fields = '';
- if ($request) {
- $headers = '(request-target)' . ': ' . trim($request) . "\n";
- $fields = '(request-target)';
- }
-
- if ($head) {
- foreach ($head as $k => $v) {
- $headers .= strtolower($k) . ': ' . trim($v) . "\n";
- if ($fields) {
- $fields .= ' ';
- }
- $fields .= strtolower($k);
+ foreach ($head as $k => $v) {
+ $headers .= strtolower($k) . ': ' . trim($v) . "\n";
+ if ($fields) {
+ $fields .= ' ';
}
- // strip the trailing linefeed
- $headers = rtrim($headers, "\n");
+ $fields .= strtolower($k);
}
+ // strip the trailing linefeed
+ $headers = rtrim($headers, "\n");
$sig = base64_encode(Crypto::rsaSign($headers, $prvkey, $alg));
return '';
}
+
+ /**
+ * Functions for ActivityPub
+ */
+
+ public static function transmit($data, $target, $uid)
+ {
+ $owner = User::getOwnerDataById($uid);
+
+ if (!$owner) {
+ return;
+ }
+
+ $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+
+ // Header data that is about to be signed.
+ $host = parse_url($target, PHP_URL_HOST);
+ $path = parse_url($target, PHP_URL_PATH);
+ $digest = 'SHA-256=' . base64_encode(hash('sha256', $content, true));
+ $content_length = strlen($content);
+
+ $headers = ['Content-Length: ' . $content_length, 'Digest: ' . $digest, 'Host: ' . $host];
+
+ $signed_data = "(request-target): post " . $path . "\ncontent-length: " . $content_length . "\ndigest: " . $digest . "\nhost: " . $host;
+
+ $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
+
+ $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) content-length digest host",signature="' . $signature . '"';
+
+ $headers[] = 'Content-Type: application/activity+json';
+
+ Network::post($target, $content, $headers);
+ $return_code = BaseObject::getApp()->get_curl_code();
+
+ logger('Transmit to ' . $target . ' returned ' . $return_code);
+ }
+
+ public static function getSigner($content, $http_headers)
+ {
+ $object = json_decode($content, true);
+
+ if (empty($object)) {
+ return false;
+ }
+
+ $actor = JsonLD::fetchElement($object, 'actor', 'id');
+
+ $headers = [];
+ $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . $http_headers['REQUEST_URI'];
+
+ // First take every header
+ foreach ($http_headers as $k => $v) {
+ $field = str_replace('_', '-', strtolower($k));
+ $headers[$field] = $v;
+ }
+
+ // Now add every http header
+ foreach ($http_headers as $k => $v) {
+ if (strpos($k, 'HTTP_') === 0) {
+ $field = str_replace('_', '-', strtolower(substr($k, 5)));
+ $headers[$field] = $v;
+ }
+ }
+
+ $sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']);
+
+ if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) {
+ return false;
+ }
+
+ $signed_data = '';
+ foreach ($sig_block['headers'] as $h) {
+ if (array_key_exists($h, $headers)) {
+ $signed_data .= $h . ': ' . $headers[$h] . "\n";
+ }
+ }
+ $signed_data = rtrim($signed_data, "\n");
+
+ if (empty($signed_data)) {
+ return false;
+ }
+
+ $algorithm = null;
+
+ if ($sig_block['algorithm'] === 'rsa-sha256') {
+ $algorithm = 'sha256';
+ }
+
+ if ($sig_block['algorithm'] === 'rsa-sha512') {
+ $algorithm = 'sha512';
+ }
+
+ if (empty($algorithm)) {
+ return false;
+ }
+
+ $key = self::fetchKey($sig_block['keyId'], $actor);
+
+ if (empty($key)) {
+ return false;
+ }
+
+ if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
+ return false;
+ }
+
+ // Check the digest when it is part of the signed data
+ if (in_array('digest', $sig_block['headers'])) {
+ $digest = explode('=', $headers['digest'], 2);
+ if ($digest[0] === 'SHA-256') {
+ $hashalg = 'sha256';
+ }
+ if ($digest[0] === 'SHA-512') {
+ $hashalg = 'sha512';
+ }
+
+ /// @todo add all hashes from the rfc
+
+ if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) {
+ return false;
+ }
+ }
+
+ // Check the content-length when it is part of the signed data
+ if (in_array('content-length', $sig_block['headers'])) {
+ if (strlen($content) != $headers['content-length']) {
+ return false;
+ }
+ }
+
+ return $key['url'];
+ }
+
+ private static function fetchKey($id, $actor)
+ {
+ $url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id);
+
+ $profile = ActivityPub::fetchprofile($url);
+ if (!empty($profile)) {
+ logger('Taking key from id ' . $id, LOGGER_DEBUG);
+ return ['url' => $url, 'pubkey' => $profile['pubkey']];
+ } elseif ($url != $actor) {
+ $profile = ActivityPub::fetchprofile($actor);
+ if (!empty($profile)) {
+ logger('Taking key from actor ' . $actor, LOGGER_DEBUG);
+ return ['url' => $actor, 'pubkey' => $profile['pubkey']];
+ }
+ }
+
+ return false;
+ }
}
--- /dev/null
+<?php
+/**
+ * @file src/Util/JsonLD.php
+ */
+namespace Friendica\Util;
+
+use Friendica\Core\Cache;
+use digitalbazaar\jsonld as DBJsonLD;
+
+/**
+ * @brief This class contain methods to work with JsonLD data
+ */
+class JsonLD
+{
+ public static function documentLoader($url)
+ {
+ $recursion = 0;
+
+ $x = debug_backtrace();
+ if ($x) {
+ foreach ($x as $n) {
+ if ($n['function'] === __FUNCTION__) {
+ $recursion ++;
+ }
+ }
+ }
+
+ if ($recursion > 5) {
+ logger('jsonld bomb detected at: ' . $url);
+ exit();
+ }
+
+ $result = Cache::get('documentLoader:' . $url);
+ if (!is_null($result)) {
+ return $result;
+ }
+
+ $data = jsonld_default_document_loader($url);
+ Cache::set('documentLoader:' . $url, $data, CACHE_DAY);
+ return $data;
+ }
+
+ private static function objectify($element)
+ {
+ if (is_array($element)) {
+ $keys = array_keys($element);
+ if (is_int(array_pop($keys))) {
+ return array_map('objectify', $element);
+ } else {
+ return (object)array_map('objectify', $element);
+ }
+ } else {
+ return $element;
+ }
+ }
+
+ public static function normalize($json)
+ {
+ jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
+
+// $jsonobj = array_map('Friendica\Util\JsonLD::objectify', $json);
+ $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+
+ return jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
+ }
+
+ public static function compact($json)
+ {
+ jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
+
+ $context = (object)['as' => 'https://www.w3.org/ns/activitystreams',
+ 'w3sec' => 'https://w3id.org/security',
+ 'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+ 'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
+ 'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
+
+ $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+
+ $compacted = jsonld_compact($jsonobj, $context);
+
+ return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
+ }
+
+ public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+ {
+ if (empty($array)) {
+ return false;
+ }
+
+ if (empty($array[$element])) {
+ return false;
+ }
+
+ if (is_string($array[$element])) {
+ return $array[$element];
+ }
+
+ if (is_null($type_value)) {
+ if (!empty($array[$element][$key])) {
+ return $array[$element][$key];
+ }
+
+ if (!empty($array[$element][0][$key])) {
+ return $array[$element][0][$key];
+ }
+
+ return false;
+ }
+
+ if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
+ return $array[$element][$key];
+ }
+
+ /// @todo Add array search
+
+ return false;
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Util;
+
+use Friendica\Util\JsonLD;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Protocol\ActivityPub;
+
+/**
+ * @brief Implements JSON-LD signatures
+ *
+ * Ported from Osada: https://framagit.org/macgirvin/osada
+ */
+class LDSignature
+{
+ public static function isSigned($data)
+ {
+ return !empty($data['signature']);
+ }
+
+ public static function getSigner($data)
+ {
+ if (!self::isSigned($data)) {
+ return false;
+ }
+
+/*
+ $creator = $data['signature']['creator'];
+ $actor = JsonLD::fetchElement($data, 'actor', 'id');
+
+ $url = (strpos($creator, '#') ? substr($creator, 0, strpos($creator, '#')) : $creator);
+
+ $profile = ActivityPub::fetchprofile($url);
+ if (!empty($profile)) {
+ logger('Taking key from creator ' . $creator, LOGGER_DEBUG);
+ } elseif ($url != $actor) {
+ $profile = ActivityPub::fetchprofile($actor);
+ if (empty($profile)) {
+ return false;
+ }
+ logger('Taking key from actor ' . $actor, LOGGER_DEBUG);
+ }
+
+*/
+ $actor = JsonLD::fetchElement($data, 'actor', 'id');
+ if (empty($actor)) {
+ return false;
+ }
+
+ $profile = ActivityPub::fetchprofile($actor);
+ if (empty($profile['pubkey'])) {
+ return false;
+ }
+ $pubkey = $profile['pubkey'];
+
+ $ohash = self::hash(self::signable_options($data['signature']));
+ $dhash = self::hash(self::signable_data($data));
+
+ $x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
+ logger('LD-verify: ' . intval($x));
+
+ if (empty($x)) {
+ return false;
+ } else {
+ return $actor;
+ }
+ }
+
+ public static function sign($data, $owner)
+ {
+ $options = [
+ 'type' => 'RsaSignature2017',
+ 'nonce' => random_string(64),
+ 'creator' => $owner['url'] . '#main-key',
+ 'created' => DateTimeFormat::utcNow(DateTimeFormat::ATOM)
+ ];
+
+ $ohash = self::hash(self::signable_options($options));
+ $dhash = self::hash(self::signable_data($data));
+ $options['signatureValue'] = base64_encode(Crypto::rsaSign($ohash . $dhash, $owner['uprvkey']));
+
+ return array_merge($data, ['signature' => $options]);
+ }
+
+
+ private static function signable_data($data)
+ {
+ unset($data['signature']);
+ return $data;
+ }
+
+
+ private static function signable_options($options)
+ {
+ $newopts = ['@context' => 'https://w3id.org/identity/v1'];
+ if (!empty($options)) {
+ foreach ($options as $k => $v) {
+ if (!in_array($k, ['type', 'id', 'signatureValue'])) {
+ $newopts[$k] = $v;
+ }
+ }
+ }
+ return $newopts;
+ }
+
+ private static function hash($obj)
+ {
+ return hash('sha256', JsonLD::normalize($obj));
+ }
+}
--- /dev/null
+<?php
+/**
+ * @file src/Worker/APDelivery.php
+ */
+namespace Friendica\Worker;
+
+use Friendica\BaseObject;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Model\Item;
+use Friendica\Util\HTTPSignature;
+
+class APDelivery extends BaseObject
+{
+ public static function execute($cmd, $item_id, $inbox, $uid)
+ {
+ logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $inbox, LOGGER_DEBUG);
+
+ if ($cmd == Delivery::MAIL) {
+ } elseif ($cmd == Delivery::SUGGESTION) {
+ } elseif ($cmd == Delivery::RELOCATION) {
+ } else {
+ $data = ActivityPub::createActivityFromItem($item_id);
+ HTTPSignature::transmit($data, $inbox, $uid);
+ }
+
+ return;
+ }
+}
use Friendica\Model\PushSubscriber;
use Friendica\Model\User;
use Friendica\Network\Probe;
+use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\Salmon;
}
}
+ $inboxes = [];
+
+ if ($target_item['origin']) {
+ $inboxes = ActivityPub::fetchTargetInboxes($target_item, $uid);
+ }
+
+ if ($parent['origin']) {
+ $parent_inboxes = ActivityPub::fetchTargetInboxes($parent, $uid);
+ $inboxes = array_merge($inboxes, $parent_inboxes);
+ }
+
+ foreach ($inboxes as $inbox) {
+ logger('Deliver ' . $item_id .' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+
+ Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+ 'APDelivery', $cmd, $item_id, $inbox, $uid);
+ }
+
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// They are especially used for notifications to OStatus users that don't follow us.
if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
return;
}
- if (!in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ if (!in_array($r[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
return;
}
$data = Probe::uri($r[0]["url"]);
- if (!in_array($data["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
if ($r[0]["server_url"] != "") {
PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
}
projects / friendica.git / commitdiff