@@ -37,48 +37,48 @@ |
||
37 | 37 | */ |
38 | 38 | class DataResponse extends Response { |
39 | 39 | |
40 | - /** |
|
41 | - * response data |
|
42 | - * @var array|object |
|
43 | - */ |
|
44 | - protected $data; |
|
40 | + /** |
|
41 | + * response data |
|
42 | + * @var array|object |
|
43 | + */ |
|
44 | + protected $data; |
|
45 | 45 | |
46 | 46 | |
47 | - /** |
|
48 | - * @param array|object $data the object or array that should be transformed |
|
49 | - * @param int $statusCode the Http status code, defaults to 200 |
|
50 | - * @param array $headers additional key value based headers |
|
51 | - * @since 8.0.0 |
|
52 | - */ |
|
53 | - public function __construct($data=array(), $statusCode=Http::STATUS_OK, |
|
54 | - array $headers=array()) { |
|
55 | - $this->data = $data; |
|
56 | - $this->setStatus($statusCode); |
|
57 | - $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
58 | - } |
|
47 | + /** |
|
48 | + * @param array|object $data the object or array that should be transformed |
|
49 | + * @param int $statusCode the Http status code, defaults to 200 |
|
50 | + * @param array $headers additional key value based headers |
|
51 | + * @since 8.0.0 |
|
52 | + */ |
|
53 | + public function __construct($data=array(), $statusCode=Http::STATUS_OK, |
|
54 | + array $headers=array()) { |
|
55 | + $this->data = $data; |
|
56 | + $this->setStatus($statusCode); |
|
57 | + $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
58 | + } |
|
59 | 59 | |
60 | 60 | |
61 | - /** |
|
62 | - * Sets values in the data json array |
|
63 | - * @param array|object $data an array or object which will be transformed |
|
64 | - * @return DataResponse Reference to this object |
|
65 | - * @since 8.0.0 |
|
66 | - */ |
|
67 | - public function setData($data){ |
|
68 | - $this->data = $data; |
|
61 | + /** |
|
62 | + * Sets values in the data json array |
|
63 | + * @param array|object $data an array or object which will be transformed |
|
64 | + * @return DataResponse Reference to this object |
|
65 | + * @since 8.0.0 |
|
66 | + */ |
|
67 | + public function setData($data){ |
|
68 | + $this->data = $data; |
|
69 | 69 | |
70 | - return $this; |
|
71 | - } |
|
70 | + return $this; |
|
71 | + } |
|
72 | 72 | |
73 | 73 | |
74 | - /** |
|
75 | - * Used to get the set parameters |
|
76 | - * @return array the data |
|
77 | - * @since 8.0.0 |
|
78 | - */ |
|
79 | - public function getData(){ |
|
80 | - return $this->data; |
|
81 | - } |
|
74 | + /** |
|
75 | + * Used to get the set parameters |
|
76 | + * @return array the data |
|
77 | + * @since 8.0.0 |
|
78 | + */ |
|
79 | + public function getData(){ |
|
80 | + return $this->data; |
|
81 | + } |
|
82 | 82 | |
83 | 83 | |
84 | 84 | } |
@@ -33,12 +33,12 @@ |
||
33 | 33 | */ |
34 | 34 | interface ICallbackResponse { |
35 | 35 | |
36 | - /** |
|
37 | - * Outputs the content that should be printed |
|
38 | - * |
|
39 | - * @param IOutput $output a small wrapper that handles output |
|
40 | - * @since 8.1.0 |
|
41 | - */ |
|
42 | - function callback(IOutput $output); |
|
36 | + /** |
|
37 | + * Outputs the content that should be printed |
|
38 | + * |
|
39 | + * @param IOutput $output a small wrapper that handles output |
|
40 | + * @since 8.1.0 |
|
41 | + */ |
|
42 | + function callback(IOutput $output); |
|
43 | 43 | |
44 | 44 | } |
@@ -33,57 +33,57 @@ |
||
33 | 33 | */ |
34 | 34 | class DataDisplayResponse extends Response { |
35 | 35 | |
36 | - /** |
|
37 | - * response data |
|
38 | - * @var string; |
|
39 | - */ |
|
40 | - protected $data; |
|
36 | + /** |
|
37 | + * response data |
|
38 | + * @var string; |
|
39 | + */ |
|
40 | + protected $data; |
|
41 | 41 | |
42 | 42 | |
43 | - /** |
|
44 | - * @param string $data the data to display |
|
45 | - * @param int $statusCode the Http status code, defaults to 200 |
|
46 | - * @param array $headers additional key value based headers |
|
47 | - * @since 8.1.0 |
|
48 | - */ |
|
49 | - public function __construct($data="", $statusCode=Http::STATUS_OK, |
|
50 | - $headers=[]) { |
|
51 | - $this->data = $data; |
|
52 | - $this->setStatus($statusCode); |
|
53 | - $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
54 | - $this->addHeader('Content-Disposition', 'inline; filename=""'); |
|
55 | - } |
|
43 | + /** |
|
44 | + * @param string $data the data to display |
|
45 | + * @param int $statusCode the Http status code, defaults to 200 |
|
46 | + * @param array $headers additional key value based headers |
|
47 | + * @since 8.1.0 |
|
48 | + */ |
|
49 | + public function __construct($data="", $statusCode=Http::STATUS_OK, |
|
50 | + $headers=[]) { |
|
51 | + $this->data = $data; |
|
52 | + $this->setStatus($statusCode); |
|
53 | + $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
54 | + $this->addHeader('Content-Disposition', 'inline; filename=""'); |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * Outputs data. No processing is done. |
|
59 | - * @return string |
|
60 | - * @since 8.1.0 |
|
61 | - */ |
|
62 | - public function render() { |
|
63 | - return $this->data; |
|
64 | - } |
|
57 | + /** |
|
58 | + * Outputs data. No processing is done. |
|
59 | + * @return string |
|
60 | + * @since 8.1.0 |
|
61 | + */ |
|
62 | + public function render() { |
|
63 | + return $this->data; |
|
64 | + } |
|
65 | 65 | |
66 | 66 | |
67 | - /** |
|
68 | - * Sets values in the data |
|
69 | - * @param string $data the data to display |
|
70 | - * @return DataDisplayResponse Reference to this object |
|
71 | - * @since 8.1.0 |
|
72 | - */ |
|
73 | - public function setData($data){ |
|
74 | - $this->data = $data; |
|
67 | + /** |
|
68 | + * Sets values in the data |
|
69 | + * @param string $data the data to display |
|
70 | + * @return DataDisplayResponse Reference to this object |
|
71 | + * @since 8.1.0 |
|
72 | + */ |
|
73 | + public function setData($data){ |
|
74 | + $this->data = $data; |
|
75 | 75 | |
76 | - return $this; |
|
77 | - } |
|
76 | + return $this; |
|
77 | + } |
|
78 | 78 | |
79 | 79 | |
80 | - /** |
|
81 | - * Used to get the set parameters |
|
82 | - * @return string the data |
|
83 | - * @since 8.1.0 |
|
84 | - */ |
|
85 | - public function getData(){ |
|
86 | - return $this->data; |
|
87 | - } |
|
80 | + /** |
|
81 | + * Used to get the set parameters |
|
82 | + * @return string the data |
|
83 | + * @since 8.1.0 |
|
84 | + */ |
|
85 | + public function getData(){ |
|
86 | + return $this->data; |
|
87 | + } |
|
88 | 88 | |
89 | 89 | } |
@@ -29,36 +29,36 @@ |
||
29 | 29 | * @since 8.0.0 |
30 | 30 | */ |
31 | 31 | class DataDownloadResponse extends DownloadResponse { |
32 | - /** |
|
33 | - * @var string |
|
34 | - */ |
|
35 | - private $data; |
|
32 | + /** |
|
33 | + * @var string |
|
34 | + */ |
|
35 | + private $data; |
|
36 | 36 | |
37 | - /** |
|
38 | - * Creates a response that prompts the user to download the text |
|
39 | - * @param string $data text to be downloaded |
|
40 | - * @param string $filename the name that the downloaded file should have |
|
41 | - * @param string $contentType the mimetype that the downloaded file should have |
|
42 | - * @since 8.0.0 |
|
43 | - */ |
|
44 | - public function __construct($data, $filename, $contentType) { |
|
45 | - $this->data = $data; |
|
46 | - parent::__construct($filename, $contentType); |
|
47 | - } |
|
37 | + /** |
|
38 | + * Creates a response that prompts the user to download the text |
|
39 | + * @param string $data text to be downloaded |
|
40 | + * @param string $filename the name that the downloaded file should have |
|
41 | + * @param string $contentType the mimetype that the downloaded file should have |
|
42 | + * @since 8.0.0 |
|
43 | + */ |
|
44 | + public function __construct($data, $filename, $contentType) { |
|
45 | + $this->data = $data; |
|
46 | + parent::__construct($filename, $contentType); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param string $data |
|
51 | - * @since 8.0.0 |
|
52 | - */ |
|
53 | - public function setData($data) { |
|
54 | - $this->data = $data; |
|
55 | - } |
|
49 | + /** |
|
50 | + * @param string $data |
|
51 | + * @since 8.0.0 |
|
52 | + */ |
|
53 | + public function setData($data) { |
|
54 | + $this->data = $data; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @return string |
|
59 | - * @since 8.0.0 |
|
60 | - */ |
|
61 | - public function render() { |
|
62 | - return $this->data; |
|
63 | - } |
|
57 | + /** |
|
58 | + * @return string |
|
59 | + * @since 8.0.0 |
|
60 | + */ |
|
61 | + public function render() { |
|
62 | + return $this->data; |
|
63 | + } |
|
64 | 64 | } |
@@ -32,38 +32,38 @@ |
||
32 | 32 | */ |
33 | 33 | class FileDisplayResponse extends Response implements ICallbackResponse { |
34 | 34 | |
35 | - /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */ |
|
36 | - private $file; |
|
35 | + /** @var \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile */ |
|
36 | + private $file; |
|
37 | 37 | |
38 | - /** |
|
39 | - * FileDisplayResponse constructor. |
|
40 | - * |
|
41 | - * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file |
|
42 | - * @param int $statusCode |
|
43 | - * @param array $headers |
|
44 | - * @since 11.0.0 |
|
45 | - */ |
|
46 | - public function __construct($file, $statusCode=Http::STATUS_OK, |
|
47 | - $headers=[]) { |
|
48 | - $this->file = $file; |
|
49 | - $this->setStatus($statusCode); |
|
50 | - $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
51 | - $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
38 | + /** |
|
39 | + * FileDisplayResponse constructor. |
|
40 | + * |
|
41 | + * @param \OCP\Files\File|\OCP\Files\SimpleFS\ISimpleFile $file |
|
42 | + * @param int $statusCode |
|
43 | + * @param array $headers |
|
44 | + * @since 11.0.0 |
|
45 | + */ |
|
46 | + public function __construct($file, $statusCode=Http::STATUS_OK, |
|
47 | + $headers=[]) { |
|
48 | + $this->file = $file; |
|
49 | + $this->setStatus($statusCode); |
|
50 | + $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
|
51 | + $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
52 | 52 | |
53 | - $this->setETag($file->getEtag()); |
|
54 | - $lastModified = new \DateTime(); |
|
55 | - $lastModified->setTimestamp($file->getMTime()); |
|
56 | - $this->setLastModified($lastModified); |
|
57 | - } |
|
53 | + $this->setETag($file->getEtag()); |
|
54 | + $lastModified = new \DateTime(); |
|
55 | + $lastModified->setTimestamp($file->getMTime()); |
|
56 | + $this->setLastModified($lastModified); |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * @param IOutput $output |
|
61 | - * @since 11.0.0 |
|
62 | - */ |
|
63 | - public function callback(IOutput $output) { |
|
64 | - if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
|
65 | - $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
66 | - $output->setOutput($this->file->getContent()); |
|
67 | - } |
|
68 | - } |
|
59 | + /** |
|
60 | + * @param IOutput $output |
|
61 | + * @since 11.0.0 |
|
62 | + */ |
|
63 | + public function callback(IOutput $output) { |
|
64 | + if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
|
65 | + $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
66 | + $output->setOutput($this->file->getContent()); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | } |
@@ -32,19 +32,19 @@ |
||
32 | 32 | */ |
33 | 33 | class NotFoundResponse extends Response { |
34 | 34 | |
35 | - /** |
|
36 | - * @since 8.1.0 |
|
37 | - */ |
|
38 | - public function __construct() { |
|
39 | - $this->setStatus(404); |
|
40 | - } |
|
35 | + /** |
|
36 | + * @since 8.1.0 |
|
37 | + */ |
|
38 | + public function __construct() { |
|
39 | + $this->setStatus(404); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string |
|
44 | - * @since 8.1.0 |
|
45 | - */ |
|
46 | - public function render() { |
|
47 | - $template = new Template('core', '404', 'guest'); |
|
48 | - return $template->fetchPage(); |
|
49 | - } |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + * @since 8.1.0 |
|
45 | + */ |
|
46 | + public function render() { |
|
47 | + $template = new Template('core', '404', 'guest'); |
|
48 | + return $template->fetchPage(); |
|
49 | + } |
|
50 | 50 | } |
@@ -37,124 +37,124 @@ |
||
37 | 37 | */ |
38 | 38 | class TemplateResponse extends Response { |
39 | 39 | |
40 | - /** |
|
41 | - * name of the template |
|
42 | - * @var string |
|
43 | - */ |
|
44 | - protected $templateName; |
|
45 | - |
|
46 | - /** |
|
47 | - * parameters |
|
48 | - * @var array |
|
49 | - */ |
|
50 | - protected $params; |
|
51 | - |
|
52 | - /** |
|
53 | - * rendering type (admin, user, blank) |
|
54 | - * @var string |
|
55 | - */ |
|
56 | - protected $renderAs; |
|
57 | - |
|
58 | - /** |
|
59 | - * app name |
|
60 | - * @var string |
|
61 | - */ |
|
62 | - protected $appName; |
|
63 | - |
|
64 | - /** |
|
65 | - * constructor of TemplateResponse |
|
66 | - * @param string $appName the name of the app to load the template from |
|
67 | - * @param string $templateName the name of the template |
|
68 | - * @param array $params an array of parameters which should be passed to the |
|
69 | - * template |
|
70 | - * @param string $renderAs how the page should be rendered, defaults to user |
|
71 | - * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0 |
|
72 | - */ |
|
73 | - public function __construct($appName, $templateName, array $params=array(), |
|
74 | - $renderAs='user') { |
|
75 | - $this->templateName = $templateName; |
|
76 | - $this->appName = $appName; |
|
77 | - $this->params = $params; |
|
78 | - $this->renderAs = $renderAs; |
|
79 | - } |
|
80 | - |
|
81 | - |
|
82 | - /** |
|
83 | - * Sets template parameters |
|
84 | - * @param array $params an array with key => value structure which sets template |
|
85 | - * variables |
|
86 | - * @return TemplateResponse Reference to this object |
|
87 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
88 | - */ |
|
89 | - public function setParams(array $params){ |
|
90 | - $this->params = $params; |
|
91 | - |
|
92 | - return $this; |
|
93 | - } |
|
94 | - |
|
95 | - |
|
96 | - /** |
|
97 | - * Used for accessing the set parameters |
|
98 | - * @return array the params |
|
99 | - * @since 6.0.0 |
|
100 | - */ |
|
101 | - public function getParams(){ |
|
102 | - return $this->params; |
|
103 | - } |
|
104 | - |
|
105 | - |
|
106 | - /** |
|
107 | - * Used for accessing the name of the set template |
|
108 | - * @return string the name of the used template |
|
109 | - * @since 6.0.0 |
|
110 | - */ |
|
111 | - public function getTemplateName(){ |
|
112 | - return $this->templateName; |
|
113 | - } |
|
114 | - |
|
115 | - |
|
116 | - /** |
|
117 | - * Sets the template page |
|
118 | - * @param string $renderAs admin, user or blank. Admin also prints the admin |
|
119 | - * settings header and footer, user renders the normal |
|
120 | - * normal page including footer and header and blank |
|
121 | - * just renders the plain template |
|
122 | - * @return TemplateResponse Reference to this object |
|
123 | - * @since 6.0.0 - return value was added in 7.0.0 |
|
124 | - */ |
|
125 | - public function renderAs($renderAs){ |
|
126 | - $this->renderAs = $renderAs; |
|
127 | - |
|
128 | - return $this; |
|
129 | - } |
|
130 | - |
|
131 | - |
|
132 | - /** |
|
133 | - * Returns the set renderAs |
|
134 | - * @return string the renderAs value |
|
135 | - * @since 6.0.0 |
|
136 | - */ |
|
137 | - public function getRenderAs(){ |
|
138 | - return $this->renderAs; |
|
139 | - } |
|
140 | - |
|
141 | - |
|
142 | - /** |
|
143 | - * Returns the rendered html |
|
144 | - * @return string the rendered html |
|
145 | - * @since 6.0.0 |
|
146 | - */ |
|
147 | - public function render(){ |
|
148 | - // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response |
|
149 | - $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs; |
|
150 | - |
|
151 | - $template = new \OCP\Template($this->appName, $this->templateName, $renderAs); |
|
152 | - |
|
153 | - foreach($this->params as $key => $value){ |
|
154 | - $template->assign($key, $value); |
|
155 | - } |
|
156 | - |
|
157 | - return $template->fetchPage(); |
|
158 | - } |
|
40 | + /** |
|
41 | + * name of the template |
|
42 | + * @var string |
|
43 | + */ |
|
44 | + protected $templateName; |
|
45 | + |
|
46 | + /** |
|
47 | + * parameters |
|
48 | + * @var array |
|
49 | + */ |
|
50 | + protected $params; |
|
51 | + |
|
52 | + /** |
|
53 | + * rendering type (admin, user, blank) |
|
54 | + * @var string |
|
55 | + */ |
|
56 | + protected $renderAs; |
|
57 | + |
|
58 | + /** |
|
59 | + * app name |
|
60 | + * @var string |
|
61 | + */ |
|
62 | + protected $appName; |
|
63 | + |
|
64 | + /** |
|
65 | + * constructor of TemplateResponse |
|
66 | + * @param string $appName the name of the app to load the template from |
|
67 | + * @param string $templateName the name of the template |
|
68 | + * @param array $params an array of parameters which should be passed to the |
|
69 | + * template |
|
70 | + * @param string $renderAs how the page should be rendered, defaults to user |
|
71 | + * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0 |
|
72 | + */ |
|
73 | + public function __construct($appName, $templateName, array $params=array(), |
|
74 | + $renderAs='user') { |
|
75 | + $this->templateName = $templateName; |
|
76 | + $this->appName = $appName; |
|
77 | + $this->params = $params; |
|
78 | + $this->renderAs = $renderAs; |
|
79 | + } |
|
80 | + |
|
81 | + |
|
82 | + /** |
|
83 | + * Sets template parameters |
|
84 | + * @param array $params an array with key => value structure which sets template |
|
85 | + * variables |
|
86 | + * @return TemplateResponse Reference to this object |
|
87 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
88 | + */ |
|
89 | + public function setParams(array $params){ |
|
90 | + $this->params = $params; |
|
91 | + |
|
92 | + return $this; |
|
93 | + } |
|
94 | + |
|
95 | + |
|
96 | + /** |
|
97 | + * Used for accessing the set parameters |
|
98 | + * @return array the params |
|
99 | + * @since 6.0.0 |
|
100 | + */ |
|
101 | + public function getParams(){ |
|
102 | + return $this->params; |
|
103 | + } |
|
104 | + |
|
105 | + |
|
106 | + /** |
|
107 | + * Used for accessing the name of the set template |
|
108 | + * @return string the name of the used template |
|
109 | + * @since 6.0.0 |
|
110 | + */ |
|
111 | + public function getTemplateName(){ |
|
112 | + return $this->templateName; |
|
113 | + } |
|
114 | + |
|
115 | + |
|
116 | + /** |
|
117 | + * Sets the template page |
|
118 | + * @param string $renderAs admin, user or blank. Admin also prints the admin |
|
119 | + * settings header and footer, user renders the normal |
|
120 | + * normal page including footer and header and blank |
|
121 | + * just renders the plain template |
|
122 | + * @return TemplateResponse Reference to this object |
|
123 | + * @since 6.0.0 - return value was added in 7.0.0 |
|
124 | + */ |
|
125 | + public function renderAs($renderAs){ |
|
126 | + $this->renderAs = $renderAs; |
|
127 | + |
|
128 | + return $this; |
|
129 | + } |
|
130 | + |
|
131 | + |
|
132 | + /** |
|
133 | + * Returns the set renderAs |
|
134 | + * @return string the renderAs value |
|
135 | + * @since 6.0.0 |
|
136 | + */ |
|
137 | + public function getRenderAs(){ |
|
138 | + return $this->renderAs; |
|
139 | + } |
|
140 | + |
|
141 | + |
|
142 | + /** |
|
143 | + * Returns the rendered html |
|
144 | + * @return string the rendered html |
|
145 | + * @since 6.0.0 |
|
146 | + */ |
|
147 | + public function render(){ |
|
148 | + // \OCP\Template needs an empty string instead of 'blank' for an unwrapped response |
|
149 | + $renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs; |
|
150 | + |
|
151 | + $template = new \OCP\Template($this->appName, $this->templateName, $renderAs); |
|
152 | + |
|
153 | + foreach($this->params as $key => $value){ |
|
154 | + $template->assign($key, $value); |
|
155 | + } |
|
156 | + |
|
157 | + return $template->fetchPage(); |
|
158 | + } |
|
159 | 159 | |
160 | 160 | } |
@@ -38,50 +38,50 @@ |
||
38 | 38 | * @since 8.1.0 |
39 | 39 | */ |
40 | 40 | class ContentSecurityPolicy extends EmptyContentSecurityPolicy { |
41 | - /** @var bool Whether inline JS snippets are allowed */ |
|
42 | - protected $inlineScriptAllowed = false; |
|
43 | - /** |
|
44 | - * @var bool Whether eval in JS scripts is allowed |
|
45 | - * TODO: Disallow per default |
|
46 | - * @link https://github.com/owncloud/core/issues/11925 |
|
47 | - */ |
|
48 | - protected $evalScriptAllowed = true; |
|
49 | - /** @var array Domains from which scripts can get loaded */ |
|
50 | - protected $allowedScriptDomains = [ |
|
51 | - '\'self\'', |
|
52 | - ]; |
|
53 | - /** |
|
54 | - * @var bool Whether inline CSS is allowed |
|
55 | - * TODO: Disallow per default |
|
56 | - * @link https://github.com/owncloud/core/issues/13458 |
|
57 | - */ |
|
58 | - protected $inlineStyleAllowed = true; |
|
59 | - /** @var array Domains from which CSS can get loaded */ |
|
60 | - protected $allowedStyleDomains = [ |
|
61 | - '\'self\'', |
|
62 | - ]; |
|
63 | - /** @var array Domains from which images can get loaded */ |
|
64 | - protected $allowedImageDomains = [ |
|
65 | - '\'self\'', |
|
66 | - 'data:', |
|
67 | - 'blob:', |
|
68 | - ]; |
|
69 | - /** @var array Domains to which connections can be done */ |
|
70 | - protected $allowedConnectDomains = [ |
|
71 | - '\'self\'', |
|
72 | - ]; |
|
73 | - /** @var array Domains from which media elements can be loaded */ |
|
74 | - protected $allowedMediaDomains = [ |
|
75 | - '\'self\'', |
|
76 | - ]; |
|
77 | - /** @var array Domains from which object elements can be loaded */ |
|
78 | - protected $allowedObjectDomains = []; |
|
79 | - /** @var array Domains from which iframes can be loaded */ |
|
80 | - protected $allowedFrameDomains = []; |
|
81 | - /** @var array Domains from which fonts can be loaded */ |
|
82 | - protected $allowedFontDomains = [ |
|
83 | - '\'self\'', |
|
84 | - ]; |
|
85 | - /** @var array Domains from which web-workers and nested browsing content can load elements */ |
|
86 | - protected $allowedChildSrcDomains = []; |
|
41 | + /** @var bool Whether inline JS snippets are allowed */ |
|
42 | + protected $inlineScriptAllowed = false; |
|
43 | + /** |
|
44 | + * @var bool Whether eval in JS scripts is allowed |
|
45 | + * TODO: Disallow per default |
|
46 | + * @link https://github.com/owncloud/core/issues/11925 |
|
47 | + */ |
|
48 | + protected $evalScriptAllowed = true; |
|
49 | + /** @var array Domains from which scripts can get loaded */ |
|
50 | + protected $allowedScriptDomains = [ |
|
51 | + '\'self\'', |
|
52 | + ]; |
|
53 | + /** |
|
54 | + * @var bool Whether inline CSS is allowed |
|
55 | + * TODO: Disallow per default |
|
56 | + * @link https://github.com/owncloud/core/issues/13458 |
|
57 | + */ |
|
58 | + protected $inlineStyleAllowed = true; |
|
59 | + /** @var array Domains from which CSS can get loaded */ |
|
60 | + protected $allowedStyleDomains = [ |
|
61 | + '\'self\'', |
|
62 | + ]; |
|
63 | + /** @var array Domains from which images can get loaded */ |
|
64 | + protected $allowedImageDomains = [ |
|
65 | + '\'self\'', |
|
66 | + 'data:', |
|
67 | + 'blob:', |
|
68 | + ]; |
|
69 | + /** @var array Domains to which connections can be done */ |
|
70 | + protected $allowedConnectDomains = [ |
|
71 | + '\'self\'', |
|
72 | + ]; |
|
73 | + /** @var array Domains from which media elements can be loaded */ |
|
74 | + protected $allowedMediaDomains = [ |
|
75 | + '\'self\'', |
|
76 | + ]; |
|
77 | + /** @var array Domains from which object elements can be loaded */ |
|
78 | + protected $allowedObjectDomains = []; |
|
79 | + /** @var array Domains from which iframes can be loaded */ |
|
80 | + protected $allowedFrameDomains = []; |
|
81 | + /** @var array Domains from which fonts can be loaded */ |
|
82 | + protected $allowedFontDomains = [ |
|
83 | + '\'self\'', |
|
84 | + ]; |
|
85 | + /** @var array Domains from which web-workers and nested browsing content can load elements */ |
|
86 | + protected $allowedChildSrcDomains = []; |
|
87 | 87 | } |
@@ -32,48 +32,48 @@ |
||
32 | 32 | */ |
33 | 33 | interface IOutput { |
34 | 34 | |
35 | - /** |
|
36 | - * @param string $out |
|
37 | - * @since 8.1.0 |
|
38 | - */ |
|
39 | - public function setOutput($out); |
|
35 | + /** |
|
36 | + * @param string $out |
|
37 | + * @since 8.1.0 |
|
38 | + */ |
|
39 | + public function setOutput($out); |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param string|resource $path or file handle |
|
43 | - * |
|
44 | - * @return bool false if an error occurred |
|
45 | - * @since 8.1.0 |
|
46 | - */ |
|
47 | - public function setReadfile($path); |
|
41 | + /** |
|
42 | + * @param string|resource $path or file handle |
|
43 | + * |
|
44 | + * @return bool false if an error occurred |
|
45 | + * @since 8.1.0 |
|
46 | + */ |
|
47 | + public function setReadfile($path); |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param string $header |
|
51 | - * @since 8.1.0 |
|
52 | - */ |
|
53 | - public function setHeader($header); |
|
49 | + /** |
|
50 | + * @param string $header |
|
51 | + * @since 8.1.0 |
|
52 | + */ |
|
53 | + public function setHeader($header); |
|
54 | 54 | |
55 | - /** |
|
56 | - * @return int returns the current http response code |
|
57 | - * @since 8.1.0 |
|
58 | - */ |
|
59 | - public function getHttpResponseCode(); |
|
55 | + /** |
|
56 | + * @return int returns the current http response code |
|
57 | + * @since 8.1.0 |
|
58 | + */ |
|
59 | + public function getHttpResponseCode(); |
|
60 | 60 | |
61 | - /** |
|
62 | - * @param int $code sets the http status code |
|
63 | - * @since 8.1.0 |
|
64 | - */ |
|
65 | - public function setHttpResponseCode($code); |
|
61 | + /** |
|
62 | + * @param int $code sets the http status code |
|
63 | + * @since 8.1.0 |
|
64 | + */ |
|
65 | + public function setHttpResponseCode($code); |
|
66 | 66 | |
67 | - /** |
|
68 | - * @param string $name |
|
69 | - * @param string $value |
|
70 | - * @param int $expire |
|
71 | - * @param string $path |
|
72 | - * @param string $domain |
|
73 | - * @param bool $secure |
|
74 | - * @param bool $httpOnly |
|
75 | - * @since 8.1.0 |
|
76 | - */ |
|
77 | - public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly); |
|
67 | + /** |
|
68 | + * @param string $name |
|
69 | + * @param string $value |
|
70 | + * @param int $expire |
|
71 | + * @param string $path |
|
72 | + * @param string $domain |
|
73 | + * @param bool $secure |
|
74 | + * @param bool $httpOnly |
|
75 | + * @since 8.1.0 |
|
76 | + */ |
|
77 | + public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly); |
|
78 | 78 | |
79 | 79 | } |