Commit graph

420 commits

Author SHA1 Message Date
9428d7468a Add more user management functionality to the CLI 2018-11-05 09:08:50 -05:00
a8cc9a4780 Tests for internal user driver; closes #50 2018-11-04 12:06:30 -05:00
5f775bef7a Appease phpdbg coverage bug 2018-11-03 13:49:02 -04:00
1ac85df46b Last set of tests for User class 2018-11-03 13:26:22 -04:00
ffa7bd5a5d Fix error in previous commit 2018-11-02 12:01:03 -04:00
931fe3b585 Move password generation to the User class
This allows user drivers which wish to generate their own passwords to
do so, and those which do not to defer to the built-in generator
2018-11-02 11:52:55 -04:00
31cdf313a4 Add missing return type hints where possible 2018-11-02 11:47:10 -04:00
898533bde5 More simplification
Authentication is now used as the primary point of synchronization
between the internal database and any external database
2018-11-02 10:01:49 -04:00
40d679844b Ensure the Lang class always exists when throwing exceptions 2018-10-31 14:32:11 -04:00
27edcddc9b Simplify NCNv1 userStatus call 2018-10-28 13:59:09 -04:00
057d72c816 Remove the distinction between internal and external user functionality 2018-10-28 13:50:57 -04:00
11747c93fd Strip out unused user management functionality
Tests have been removed as well; new tests are forthcoming
2018-10-28 10:59:17 -04:00
0be9dcb5a8 Update dependencies 2018-10-26 16:27:18 -04:00
f64f0c6a22 Whitespace cleanup 2018-10-26 14:58:04 -04:00
1aa556cf12 Add HTTP authentication support to TTRSS; fixes #133
Also bump version to 0.4.0
2018-10-26 14:40:20 -04:00
edbfb12d17 Improve coverage slightly
Improves #66
2018-08-17 08:35:13 -04:00
e4d64424c7 Make new bugfix release 2018-07-22 12:30:44 -04:00
a92bad1bc8 Correctly load configuration 2018-06-18 10:09:43 -04:00
c7c5f48066 Fix notice 2018-01-24 23:25:54 -05:00
cbc9491f75 CS fixes and version bump 2018-01-12 09:48:33 -05:00
34b508171b Merge CORS branch 2018-01-12 09:41:13 -05:00
1a4989e1e0 Merge PDO branch 2018-01-12 09:28:58 -05:00
aa57227097 Use PSR-7 for authentication; fixes #53 2018-01-11 15:48:29 -05:00
90dfeb727a Implement CORS; fixes #126 2018-01-09 12:31:40 -05:00
0ec0a5b085 Ensure the request method is always uppercased 2018-01-08 17:11:38 -05:00
4b53c5e8b3 Tests and fixes for REST class; fixes #53; improves #66 2018-01-07 12:59:10 -05:00
3fa2d38f31 Initial rewrite of REST class; needs more testing, but should be functional
- improves #53
- improves #66
2018-01-06 12:02:45 -05:00
890f9b07d4 Replace Resquest objects with PSR-7 request messages; improves #53 2018-01-04 23:08:53 -05:00
9ad0b47201 Add Target class to manipulate request traget URL parts
The query part is not parsed for now because PSR-7 request objects/PHP take care of that parsing for us.
2018-01-04 14:06:45 -05:00
9eadd602bd Replace Response objects with PSR-7 response messages; improves #53
While the test suite passes, this commit yields a broken server: replacing ad hoc request objectss with PSR-7 ones is still required, as is emission of PSR-7 responses. Both will come in subsequent commits, with tests

Diactoros was chosen specifically because it includes facilities for emitting responses, something which is awkward to test. The end of this refactoring should see both the Response and Request classes disappear, and the general REST class fully covered (as well as any speculative additions to AbstractHanlder).
2018-01-03 23:13:08 -05:00
27caf147df Changes to Date helper class
- Changed 'transform' method to use ValueInfo throughout. This fixes a number of obscure bugs
- Changed the 'add' and 'sub' methods to default to "now" rather than null. This means null passes through rather than being interpreted as the current time, to be consistent with other date tools
- Also changed the 'add' and 'sub' methods so that they operate correctly with invalid date strings
- Added tests for the class; improves #66
- Modified TTRSS tests because the "iso8601" format string in ValueInfo is different from Date's older format
2018-01-02 16:53:38 -05:00
89bfc23d32 Standardize date normalization to immutables
Also move date formats to the ValueInfo class

Standardizing on immutables avoids any possible ambiguity in the API of the resultant value, as well as any ambiguity as to whether a DateTime output instance is the same instance or a clone (they had been clones)
2018-01-02 16:27:58 -05:00
87faededc6 Backport PDO changes to ValueInfo 2018-01-02 10:29:24 -05:00
ddf55e0665 Change session lifetimes to more closely match TTRSS
At least some clients seem to expect the default timeout of one day.
2018-01-01 12:31:42 -05:00
77793f95cb Controller fixes for PDO databases; fixes #72 2017-12-31 17:24:40 -05:00
ba0aeab7ec Make SQL statement type conversion use ValueInfo normalizer
This sees the addition of a dateOutFormat parameter to ValueInfo::normalize(), as well as a general simplification of how parameter binding works.

Some value type-casting results are slightly different, but this simply makes SQL statement objects consistent with the rest of the system.
2017-12-30 18:50:56 -05:00
bc9fcb975f Change "rebind" to "retype" to better reflect what actually happens 2017-12-30 17:04:21 -05:00
bc9ffa0e17 Rewrite SQLite 3 type binding tests 2017-12-30 15:59:45 -05:00
39cad91b78 CS fixes 2017-12-22 11:51:58 -05:00
4bada691e9 PDO tests and fixes; improves #72 2017-12-19 19:08:08 -05:00
ad6a09ffa1 Partially tested pdo_sqlite driver; improves #72 2017-12-19 17:15:05 -05:00
ef75b5e9ab SQLite driver tweaks 2017-12-19 12:11:49 -05:00
7ca0f4e877 Make the SQLite3 driver more generic
The changes in this commit should make it more practical to:

- Allow the driver to decide for itself whether to try creating a PDO object if its own requirements are not met
- Have any driver use a generic schema update procedure
- Use the same constructor for native and PDO SQLite
2017-12-18 18:29:32 -05:00
73c8583744 Remove reliance on xdebug; fixes #113
Code coverage information is now gathered via phpdbg (a separate executable) by if available rather than xdebug, as the latter is hard to turn on and off.

A "test:quick" task has also been added to Robo, which excludes 31 tests which together account for almost two thirds of the test run time. This should pave the way for testing to be added as a commit hook for Git.
2017-12-17 10:27:34 -05:00
b8ed7c6bf8 Added missing static keyword to Misc\ValueInfo::normalize() 2017-12-10 11:16:06 -06:00
f100cab558 Version bump 2017-12-07 18:24:35 -05:00
44ae0ba29b Collate synthetic subscription title column; fixes #127 2017-12-07 18:17:16 -05:00
0b3b3cb49c Use SQLite nocase collation; improves #127 2017-12-07 18:05:34 -05:00
79f9808f1f CS fixes 2017-12-07 15:18:25 -05:00
8d0dd15c8a Remove use of SQLite IS operator; fixes #120 2017-12-06 22:26:06 -05:00
84bd624e94 Properly fix getCounters 2017-12-06 19:16:35 -05:00
af42bceac0 Do not omit zero-unread items in TTRSS getCounter operation
Though TTRSS itself (usually) omits items that have a counter of zero, at least one client takes this to mean the last-seen counter is unchanged, rather than zero.
2017-12-06 15:50:40 -05:00
adece521a9 TTRSS: Correct mark toggling; fixes #132 2017-12-01 22:13:27 -05:00
821bb22a72 SQLite concurrency tweaks; fixes #131 2017-12-01 16:37:58 -05:00
1a9628493e Fix TTRSS path handling 2017-11-30 19:39:46 -05:00
9ac2421fe3 TTRSS: accept base64 passwords; fixes #130 2017-11-30 19:31:40 -05:00
3ffcd6dd97 Make TTRSS handler reject erroneous paths 2017-11-30 17:54:56 -05:00
a404d4d108 NCNv1: Be explicit about types; fixes #129
This is actually mandated by the specification: a change in data type requires a protocol version number change
2017-11-30 14:47:39 -05:00
4d4e8e3580 TTRSS: correct feed renaming; fixes #128 2017-11-30 12:49:23 -05:00
760b13993b Version bump 2017-11-29 23:45:27 -05:00
22cdc8916d Documentation tweaks and CS fixes 2017-11-29 22:42:50 -05:00
5cd7268c0a Added incorrectDbCharset to NCNv1 server status
This has been exposed since version 11.0.3, released before our version 0.1.0, but after implementation work had begun
2017-11-29 18:14:59 -05:00
40944a9b58 Merge remote-tracking branch 'remotes/origin/ttrss' 2017-11-29 16:05:23 -05:00
3d958547a5 Implement OPTIONS requests for NCNv1; fixes #107 2017-11-29 15:28:33 -05:00
e1f1c8b859 Refactoring 2017-11-29 13:41:26 -05:00
2bbc83aeb0 Tweak 2017-11-29 12:15:37 -05:00
40e9b7f986 Changed all TTRSS outputs to match original types exactly; improves #125 2017-11-29 11:47:10 -05:00
b4890eaced Make TTRSS tests consider data types; improves #125 2017-11-29 09:22:59 -05:00
b242c70968 Refactor of NCNv1 in anticipation of OPTIONS requests 2017-11-28 13:46:07 -05:00
91165cdd0d Fix breakage caused by last comit 2017-11-27 15:05:50 -05:00
a0bf7c16bd Fix sorting
Also avoid sorting when it's not needed by queries
2017-11-27 14:11:35 -05:00
999f255203 Fixes for bugs uncovered during client testing 2017-11-27 13:05:08 -05:00
4f85739d20 Change default SQLite timeout to 60s; improves #67
Real-world use suggests 5s is inadequate. Rather than bumping up small amounts as things break, it makes more sense to wait a very long time and investigate possible long-term solutions later, once logging is implemented.
2017-11-25 17:44:34 -05:00
05620602bf Tweak 2017-11-23 18:12:18 -05:00
b820a004d6 Complete testing of TTRSS handler
Also implemented OPTIONS handling for TTRSS; improves #107
2017-11-23 18:07:56 -05:00
c669273792 Implement TTRSS operation getHeadlines; fixe #82 2017-11-22 20:18:16 -05:00
faf00d63ba Add Database::articleCategoriesGet()
This method retrieves author-supplied categories for articles, used in TTRSS
2017-11-21 09:22:58 -05:00
e729cedeca Make getCompactHeadlines use a whitelist instead 2017-11-20 09:49:47 -05:00
5c140aedc4 Implement TTRSS operation getCompactHeadlines; fixes #95
This commit also implements the back-end for the standard getHeadlines operation and handles all special feeds and categories; fixes #119
2017-11-20 00:09:20 -05:00
5d4ea6edc0 Add ResultEmpty class
This allows for the creation of synthetic empty result sets
2017-11-19 15:49:41 -05:00
2037efce61 Added oldestArticle and latestArticle context options 2017-11-18 16:06:49 -05:00
50185ab8f6 Change code and type of consantUnknown exception 2017-11-17 22:53:54 -05:00
b0da9a1d06 Added annotation context to satisfy the TTRSS "has_note" view mode 2017-11-17 19:08:35 -05:00
b595815eb9 Change NCNv1 handler to use new "typical" articleList fieldset 2017-11-17 18:12:00 -05:00
c88b5c4f18 Make distinction between modified and marked for articles
Also added various sets of fields to include when listing articles.
2017-11-17 17:52:00 -05:00
6da86428c4 Added per-file legal boilerplate
Includes PHPDoc license tag in the file-level block with accompanying copyright notice.

Also added an AUTHORS file on the off chance of outside contributions
2017-11-16 20:51:03 -05:00
11b2066922 Added per-file legal boilerplate
Includes PHPDoc license tag in the file-level block with accompanying copyright notice.

Also added an AUTHORS file on the off chance of outside contributions
2017-11-16 20:23:18 -05:00
6c8598d897 Implement contexts for non-recursive folders, and any/no label
Adjusted TTRSS handler accordingly
2017-11-16 15:56:14 -05:00
de92fb514b Implement TTRSS opera getArticle; fixes #84 2017-11-15 15:38:49 -05:00
ea08bbb87b Implement TTRSS feed icons; fixes #121
This introduces a data model function of unusual privilege: it can retrieve favicon URLs for any subscription, regardless of user ID. This is a single-purpose hack and its use should be avoided if at all possible.
2017-11-10 12:02:59 -05:00
ea986f5032 Implement TTRSS operation updateArticle; fixes #83
This required adding the "notes" column to the arsse_marks table and adding same as a target value in Database::articleMark()

The Context class was also adjusted to remove the possibility of false positives in some tests
2017-11-09 14:21:12 -05:00
c6cd8b8aaa Removing request chunking from NCN controller 2017-11-07 10:00:31 -05:00
42a5ccb96c Handle request splitting in data model rather than controllers
Queries for multiple specific articles are limited in size because of limits on  the number of bound query parameters.

Currently this limit is somewhat arbitrarily set at 50, but it may increase.

Historically controllers would be responsible for chunking input, but this will present problems when the expected output is a result set, and of course the maintenance burden increases as the number of controllers increases.

This commit transfers the burden to the data model, and consequently introduces a ResultAggregate class which collects chunked result sets (currently only for articleList).

In the course of making these changes the mock Result class was also largely rewritten, fixing many bugs with it.

This commit does not modify the controllers nor their tests; this will be done in a subsequent commit.
2017-11-06 23:32:29 -05:00
7d19a5add0 Merge from master 2017-11-06 15:58:26 -05:00
f51152980c Introduce abstract class for result sets
Most of the SQLite3 Result class' methods are fully generic, so it should be helpful for future result sets
2017-11-05 22:28:19 -05:00
9304f99032 Make result sets single-use; change savewepoint exceptions
- Result sets are now single-use; this is required for PDO drivers (PDO result sets are not rewindable)
- Change savepoint exceptions to be simple database exceptions; codes remain the same
2017-11-05 22:13:44 -05:00
9c9c34f7fe Implement TTRSS operation getFeeds; fixes #80 2017-11-02 17:17:46 -04:00
fff6082e3c Adjust TTRSS catchupFeed to use shallow subscription listing 2017-10-31 18:12:50 -04:00
cbe82c57cd Allow subscriptions to be listed non-recursively
This is used in multiple TTRSS operations (at least catchupFeed and getFeeds, and so is a useful optimization
2017-10-31 18:09:16 -04:00
f22fe8ba95 Tweak catchupFeed 2017-10-31 09:39:06 -04:00
2a08edb27d Implement TTRSS catchupFeed operation; fixes #88 2017-10-30 23:18:43 -04:00
e4ae3ca6ea Use constants for TTRSS' special feeds and categories 2017-10-30 16:18:09 -04:00
579551f5fd Implement TTRSS operation getFeedTree; fixes #94 2017-10-30 13:11:27 -04:00
6a700f784c Tests for TTRSS operation setArticleLabel; fixes #90 2017-10-28 10:52:38 -04:00
5c4772d95a CS fixes 2017-10-20 19:02:42 -04:00
65963f228f CS fixes 2017-10-20 18:41:21 -04:00
d05aaf688f Preliminary TTRSS setArticleLabel implementation 2017-10-20 18:17:47 -04:00
488a7bddac Adapt TTRSS to new type system 2017-10-20 09:54:08 -04:00
8c6c49d588 Merge changes from master 2017-10-19 22:58:42 -04:00
f690bbb3a9 Alias Date::normalize to ValueInfo::normalize 2017-10-19 22:39:39 -04:00
d45401fb8b Adapt NCN to new type converter
This has the side-effect of removing the ability to reset a feed's title by passing null explicitly. As a non-standard behaviour it was simpler to just remove it.
2017-10-19 20:35:45 -04:00
cc875be57e Backport testing improvements from ttrss branch 2017-10-19 15:32:18 -04:00
1271a0c8c0 Add ValueInfo::normalize method
This method provides generalized, consistent type casting more versatile than PHP's basic type juggling while hiding the significant complexity in achieving this.

While this commit does not change any existing code to use the new method, the intent is for both API handlers and database drivers to use the same basic rules for type conversion while still allowing for differing failure modes.
2017-10-19 15:18:58 -04:00
4e3369cd03 List all valid TTRSS input 2017-10-15 12:47:07 -04:00
fbbf751214 Implement the TTRSS getLabels operation; fixes #89 2017-10-13 17:05:06 -04:00
2e395f3cec Complete backend support for labels 2017-10-13 00:04:26 -04:00
a343b78b02 Make exporting the database test fixture easier 2017-10-13 00:03:25 -04:00
20ff08a431 Implement TTTRSS getCounters operation; fixes #79 2017-10-11 12:55:50 -04:00
c9c6891567 Implement TTRSS getCategories; fixes #81 2017-10-07 12:46:05 -04:00
0e6eed5699 Add boolean sanitizer to ValueInfo 2017-10-07 12:44:53 -04:00
7a2de95c70 Consolidate article context handling into articleQuery function
Also consolidated article star counting into a generic articleCount function which accepts a context.

This may lead to slight efficiency losses in either listing or marking (and more significant ones in counting starred), but the advantages of centralized context handling are significant with the future addition of labels and the need to count articles under various future contexts in TTRSS.
2017-10-06 20:26:22 -04:00
26f6922b25 Partially implement labels
- Backend functions for adding, listing, removing, and editing (renaming) labels currently implemented
- TTRSS functions for adding (fixes #96), removing (fixes #97), and renaming (fixes #98) labels currently implemented
2017-10-05 17:42:12 -04:00
69b34a4e5a Implement TTRSS feed updating; fixes #86 2017-10-03 16:14:37 -04:00
03d5d554a9 Imple TTRSS functions getUnread and getConfig
- Fixes #78
- Fixes #85
2017-10-03 12:43:46 -04:00
bd6f23692c Implement TTRSS feed subscription; fixes #92 2017-10-03 10:43:09 -04:00
97b0134e56 Merge master 2017-10-02 15:42:15 -04:00
a80e283abc Perform feed discovery correctly; fixes #118 2017-10-02 11:53:52 -04:00
1b72d45adf Relegate bootstrap.php to testing; fixes #117 2017-10-01 09:33:49 -04:00
91cce6b529 Implement all TTRSS feed and category handling except subscribing to feeds
- Fixes #93
- Fixes #100
- Fixes #101
- Fixes #102
- Fixes #103
- Fixes #104
2017-09-30 22:15:55 -04:00
0a0aabe4ed Merge master 2017-09-30 12:52:05 -04:00
474f7fc2f6 Changelog; CS fixes 2017-09-30 12:05:57 -04:00
3482a35e54 Implement feed discovery; fixes #110 2017-09-30 11:43:43 -04:00
d1e4c6eed3 Fix 405 response of NCN version lister 2017-09-29 18:11:39 -04:00
00bc7a00a0 Transparently handle HEAD requests; fixes #114 2017-09-29 17:40:07 -04:00
1ca5b4b456 Add newline after password in CLI 2017-09-28 19:25:31 -04:00
5488b994f7 Merged master; CS fixes 2017-09-28 10:16:24 -04:00
96ebf936e4 CS fixes 2017-09-28 09:01:43 -04:00
5ebf6cb689 Treat objects which are convertible to strings the same as actual strings in ValueInfo 2017-09-28 08:55:47 -04:00
d365529493 Multiple fixes to input sanitization
- Database functions now accept any input, but throw typeViolation exceptions where appropriate instead of idMissing or subjectMissing
- Added unit tests for the new Misc\ValueInfo static class
- Added ValueInfo::id() method to centrally validate database IDs, and made use of it consistently
- Made use of PHP's filter_var() function where appropriate when validating or sanitizing input
- Made the NCN protocol handler reject most invalid IDs before handing off to method handlers
- Made NCN's feedUpdate and subscriptionMove methods return 422 on invalid input
- Adjusted several tests to handler type violations
2017-09-27 22:25:45 -04:00
1af8b733b5 Implement adding TTRSS categories; fixe #99 2017-09-26 22:45:54 -04:00
7b121c74ec Merge fixes from master 2017-09-26 20:25:11 -04:00
e74a3ae3cb Fix numerous bugs when adding or changing folders
- Specifying a non-integer parent no longer silently casts to 0 or 1
- Specifying a folder ID of 0 now always converts to null automatically
- Performing both a rename and move to root in the same operation no longer results in potential duplicates
- Calling folderSetProperties with an empty data array no peforms an update; it now returns false before the update call
- Modification timestamps are now actually updated when a folder is modified
- Constraint violation exceptions triggered by code (rather than the database) now print a message
- Renaming a folder or subscription to a non-string value (e.g. an array) throws an exception rather than silently casting
- Added tests to better cover all the above
- Centralized the normalization of integers and title strings into a new ValueInfo static class
2017-09-26 16:45:41 -04:00
8487a56a60 Tests for TTRSS session handling and version/level reporting
- Fixes #73
- Fixes #74
- Fixes #75
- Fixes #76
- Fixes #77
2017-09-25 10:08:37 -04:00
6e19517593 Return correct TTRSS error bodies even for HTTP-level errors
TTRSS' error message for these cases (NOT_LOGGED_IN) is not especially helpful, but that's what it returns, so that's what we should return, albeit with correct HTTP status codes.
2017-09-25 08:15:39 -04:00
3a5d346b9c Preliminary TTRSS handler 2017-09-24 23:32:21 -04:00
91432d4e16 Tests for sessions 2017-09-24 12:45:07 -04:00
b7ac63b9de Resuming a session from the database should have no side effects 2017-09-24 11:22:32 -04:00
1069447925 Make session cleanup more sophisticated 2017-09-24 10:09:36 -04:00
474d32e54f Preliminary implementation of TTRSS sessions (needs tests; may not work) 2017-09-16 19:57:33 -04:00
c393dfc42b Sundry fixes
- Make use of PHP 7's null coalescing operator
- remove use of static property in Lang class
- Improve code coverage slightly
2017-09-05 19:35:14 -04:00