Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PasteBin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PIERRON Laurent
PasteBin
Commits
411419d5
Commit
411419d5
authored
9 years ago
by
El RIDO
Browse files
Options
Downloads
Patches
Plain Diff
adding tests and unifying paste creation output
parent
2d79ba82
Branches
Branches containing commit
Tags
0.20
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/zerobin/abstract.php
+2
-2
2 additions, 2 deletions
lib/zerobin/abstract.php
lib/zerobin/data.php
+5
-5
5 additions, 5 deletions
lib/zerobin/data.php
tst/zerobin.php
+203
-21
203 additions, 21 deletions
tst/zerobin.php
with
210 additions
and
28 deletions
lib/zerobin/abstract.php
+
2
−
2
View file @
411419d5
...
...
@@ -60,7 +60,7 @@ abstract class zerobin_abstract
* @access public
* @param string $pasteid
* @param array $paste
* @return
int|false
* @return
bool
*/
abstract
public
function
create
(
$pasteid
,
$paste
);
...
...
@@ -99,7 +99,7 @@ abstract class zerobin_abstract
* @param string $parentid
* @param string $commentid
* @param array $comment
* @return
int|false
* @return
bool
*/
abstract
public
function
createComment
(
$pasteid
,
$parentid
,
$commentid
,
$comment
);
...
...
This diff is collapsed.
Click to expand it.
lib/zerobin/data.php
+
5
−
5
View file @
411419d5
...
...
@@ -55,14 +55,14 @@ class zerobin_data extends zerobin_abstract
* @access public
* @param string $pasteid
* @param array $paste
* @return
int|false
* @return
bool
*/
public
function
create
(
$pasteid
,
$paste
)
{
$storagedir
=
self
::
_dataid2path
(
$pasteid
);
if
(
is_file
(
$storagedir
.
$pasteid
))
return
false
;
if
(
!
is_dir
(
$storagedir
))
mkdir
(
$storagedir
,
0705
,
true
);
return
(
bool
)
file_put_contents
(
$storagedir
.
$pasteid
,
json_encode
(
$paste
));
return
(
bool
)
@
file_put_contents
(
$storagedir
.
$pasteid
,
json_encode
(
$paste
));
}
/**
...
...
@@ -105,7 +105,7 @@ class zerobin_data extends zerobin_abstract
$dir
->
close
();
// Delete the discussion directory.
rmdir
(
$discdir
);
@
rmdir
(
$discdir
);
}
}
...
...
@@ -129,7 +129,7 @@ class zerobin_data extends zerobin_abstract
* @param string $parentid
* @param string $commentid
* @param array $comment
* @return
int|false
* @return
bool
*/
public
function
createComment
(
$pasteid
,
$parentid
,
$commentid
,
$comment
)
{
...
...
@@ -137,7 +137,7 @@ class zerobin_data extends zerobin_abstract
$filename
=
$pasteid
.
'.'
.
$commentid
.
'.'
.
$parentid
;
if
(
is_file
(
$storagedir
.
$filename
))
return
false
;
if
(
!
is_dir
(
$storagedir
))
mkdir
(
$storagedir
,
0705
,
true
);
return
file_put_contents
(
$storagedir
.
$filename
,
json_encode
(
$comment
));
return
(
bool
)
@
file_put_contents
(
$storagedir
.
$filename
,
json_encode
(
$comment
));
}
/**
...
...
This diff is collapsed.
Click to expand it.
tst/zerobin.php
+
203
−
21
View file @
411419d5
...
...
@@ -22,6 +22,8 @@ class zerobinTest extends PHPUnit_Framework_TestCase
),
);
private
$_conf
;
private
$_model
;
public
function
setUp
()
...
...
@@ -29,6 +31,7 @@ class zerobinTest extends PHPUnit_Framework_TestCase
/* Setup Routine */
$this
->
_model
=
zerobin_data
::
getInstance
(
array
(
'dir'
=>
PATH
.
'data'
));
serversalt
::
setPath
(
PATH
.
'data'
);
$this
->
_conf
=
PATH
.
'cfg'
.
DIRECTORY_SEPARATOR
.
'conf.ini'
;
$this
->
reset
();
}
...
...
@@ -44,9 +47,8 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$_SERVER
=
array
();
if
(
$this
->
_model
->
exists
(
self
::
$pasteid
))
$this
->
_model
->
delete
(
self
::
$pasteid
);
$conf
=
PATH
.
'cfg'
.
DIRECTORY_SEPARATOR
.
'conf.ini'
;
if
(
is_file
(
$conf
.
'.bak'
))
rename
(
$conf
.
'.bak'
,
$conf
);
if
(
is_file
(
$this
->
_conf
.
'.bak'
))
rename
(
$this
->
_conf
.
'.bak'
,
$this
->
_conf
);
}
/**
...
...
@@ -98,10 +100,9 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testConf
()
{
$this
->
reset
();
$conf
=
PATH
.
'cfg'
.
DIRECTORY_SEPARATOR
.
'conf.ini'
;
if
(
!
is_file
(
$conf
.
'.bak'
)
&&
is_file
(
$conf
))
rename
(
$conf
,
$conf
.
'.bak'
);
file_put_contents
(
$conf
,
''
);
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
file_put_contents
(
$this
->
_conf
,
''
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -113,12 +114,11 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testConfMissingExpireLabel
()
{
$this
->
reset
();
$conf
=
PATH
.
'cfg'
.
DIRECTORY_SEPARATOR
.
'conf.ini'
;
$options
=
parse_ini_file
(
$conf
,
true
);
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'expire_options'
][
'foobar123'
]
=
10
;
if
(
!
is_file
(
$conf
.
'.bak'
)
&&
is_file
(
$conf
))
rename
(
$
conf
,
$
conf
.
'.bak'
);
helper
::
createIniFile
(
$conf
,
$options
);
if
(
!
is_file
(
$
this
->
_
conf
.
'.bak'
)
&&
is_file
(
$
this
->
_
conf
))
rename
(
$
this
->
_conf
,
$this
->
_
conf
.
'.bak'
);
helper
::
createIniFile
(
$
this
->
_
conf
,
$options
);
ini_set
(
'magic_quotes_gpc'
,
1
);
ob_start
();
new
zerobin
;
...
...
@@ -146,16 +146,80 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$this
->
assertTrue
(
$this
->
_model
->
exists
(
$response
[
'id'
]),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateInvalidTimelimit
()
{
$this
->
reset
();
$_POST
=
self
::
$paste
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$response
=
json_decode
(
$content
,
true
);
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs error status'
);
$this
->
assertFalse
(
$this
->
_model
->
exists
(
self
::
$pasteid
),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateInvalidSize
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'main'
][
'sizelimit'
]
=
10
;
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$response
=
json_decode
(
$content
,
true
);
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs error status'
);
$this
->
assertFalse
(
$this
->
_model
->
exists
(
self
::
$pasteid
),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateDuplicateId
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$this
->
_model
->
create
(
self
::
$pasteid
,
self
::
$paste
);
$_POST
=
self
::
$paste
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$response
=
json_decode
(
$content
,
true
);
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs error status'
);
$this
->
assertTrue
(
$this
->
_model
->
exists
(
self
::
$pasteid
),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateValidExpire
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_POST
[
'expire'
]
=
'5min'
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -175,10 +239,14 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateInvalidExpire
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_POST
[
'expire'
]
=
'foo'
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -198,10 +266,14 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateInvalidBurn
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_POST
[
'burnafterreading'
]
=
'neither 1 nor 0'
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -216,10 +288,14 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateInvalidOpenDiscussion
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_POST
[
'opendiscussion'
]
=
'neither 1 nor 0'
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -234,10 +310,14 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateValidNick
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_POST
[
'nickname'
]
=
self
::
$comment
[
'meta'
][
'nickname'
];
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -257,10 +337,14 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateInvalidNick
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$paste
;
$_POST
[
'nickname'
]
=
'foo'
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -275,12 +359,16 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateComment
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$comment
;
$_POST
[
'pasteid'
]
=
self
::
$pasteid
;
$_POST
[
'parentid'
]
=
self
::
$pasteid
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
$this
->
_model
->
create
(
self
::
$pasteid
,
self
::
$paste
);
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -289,12 +377,41 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$this
->
assertTrue
(
$this
->
_model
->
existsComment
(
self
::
$pasteid
,
self
::
$pasteid
,
$response
[
'id'
]),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateInvalidComment
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$comment
;
$_POST
[
'pasteid'
]
=
self
::
$pasteid
;
$_POST
[
'parentid'
]
=
'foo'
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
$this
->
_model
->
create
(
self
::
$pasteid
,
self
::
$paste
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$response
=
json_decode
(
$content
,
true
);
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs error status'
);
$this
->
assertFalse
(
$this
->
_model
->
existsComment
(
self
::
$pasteid
,
self
::
$pasteid
,
self
::
$commentid
),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateCommentDiscussionDisabled
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$comment
;
$_POST
[
'pasteid'
]
=
self
::
$pasteid
;
$_POST
[
'parentid'
]
=
self
::
$pasteid
;
...
...
@@ -302,7 +419,6 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$paste
=
self
::
$paste
;
$paste
[
'meta'
][
'opendiscussion'
]
=
false
;
$this
->
_model
->
create
(
self
::
$pasteid
,
$paste
);
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -317,11 +433,15 @@ class zerobinTest extends PHPUnit_Framework_TestCase
public
function
testCreateCommentInvalidPaste
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$_POST
=
self
::
$comment
;
$_POST
[
'pasteid'
]
=
self
::
$pasteid
;
$_POST
[
'parentid'
]
=
self
::
$pasteid
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
sleep
(
11
);
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
...
...
@@ -330,6 +450,30 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$this
->
assertFalse
(
$this
->
_model
->
existsComment
(
self
::
$pasteid
,
self
::
$pasteid
,
self
::
$commentid
),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
public
function
testCreateDuplicateComment
()
{
$this
->
reset
();
$options
=
parse_ini_file
(
$this
->
_conf
,
true
);
$options
[
'traffic'
][
'limit'
]
=
0
;
if
(
!
is_file
(
$this
->
_conf
.
'.bak'
)
&&
is_file
(
$this
->
_conf
))
rename
(
$this
->
_conf
,
$this
->
_conf
.
'.bak'
);
helper
::
createIniFile
(
$this
->
_conf
,
$options
);
$this
->
_model
->
createComment
(
self
::
$pasteid
,
self
::
$pasteid
,
self
::
$commentid
,
self
::
$comment
);
$_POST
=
self
::
$comment
;
$_POST
[
'pasteid'
]
=
self
::
$pasteid
;
$_POST
[
'parentid'
]
=
self
::
$pasteid
;
$_SERVER
[
'REMOTE_ADDR'
]
=
'::1'
;
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$response
=
json_decode
(
$content
,
true
);
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs error status'
);
$this
->
assertTrue
(
$this
->
_model
->
existsComment
(
self
::
$pasteid
,
self
::
$pasteid
,
self
::
$commentid
),
'paste exists after posting data'
);
}
/**
* @runInSeparateProcess
*/
...
...
@@ -453,6 +597,20 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$this
->
assertEquals
(
array
(
self
::
$paste
),
$response
[
'messages'
],
'outputs data correctly'
);
}
/**
* @runInSeparateProcess
*/
public
function
testReadInvalidJson
()
{
$this
->
reset
();
$_SERVER
[
'QUERY_STRING'
]
=
self
::
$pasteid
.
'&json'
;
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$response
=
json_decode
(
$content
,
true
);
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs error status'
);
}
/**
* @runInSeparateProcess
*/
...
...
@@ -581,4 +739,28 @@ class zerobinTest extends PHPUnit_Framework_TestCase
$this
->
assertEquals
(
1
,
$response
[
'status'
],
'outputs status'
);
$this
->
assertTrue
(
$this
->
_model
->
exists
(
self
::
$pasteid
),
'paste successfully deleted'
);
}
/**
* @runInSeparateProcess
*/
public
function
testDeleteExpired
()
{
$this
->
reset
();
$expiredPaste
=
self
::
$paste
;
$expiredPaste
[
'meta'
][
'expire_date'
]
=
$expiredPaste
[
'meta'
][
'postdate'
];
$this
->
_model
->
create
(
self
::
$pasteid
,
$expiredPaste
);
$_SERVER
[
'QUERY_STRING'
]
=
self
::
$pasteid
;
ob_start
();
new
zerobin
;
$content
=
ob_get_contents
();
$this
->
assertTag
(
array
(
'id'
=>
'errormessage'
,
'content'
=>
'Paste does not exist'
),
$content
,
'outputs error correctly'
);
$this
->
assertFalse
(
$this
->
_model
->
exists
(
self
::
$pasteid
),
'paste successfully deleted'
);
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment