Commit Graph

870 Commits

Author SHA1 Message Date
Sajith Sasidharan
008812d6c8 Render abbreviated time in map update results 2020-05-06 13:11:53 -04:00
Sajith Sasidharan
0c6889274d Render problems only when there's a problem list 2020-05-06 13:10:31 -04:00
Sajith Sasidharan
bbbca6c000 Drop a newline
Party for consistency, partly in order to trigger a CircleCI run.
2020-05-06 10:41:58 -04:00
Sajith Sasidharan
8a71567137 Avoid use of RateAndTimeMixin in MapupdateStatusPage 2020-05-06 09:29:57 -04:00
Sajith Sasidharan
86871363ea Add notes to MapupdateStatusPage 2020-05-06 09:06:56 -04:00
Sajith Sasidharan
1602c66250 Render map update status using twisted.web.template
Fixes: ticket:3291
2020-05-06 09:06:56 -04:00
Sajith Sasidharan
3b0ace1710
Merge pull request #708 from sajith/3293.status-helper-nevow-to-twisted-web
Render helper status page using twisted.web.template

Fixes: ticket:3293
2020-05-05 16:00:24 -04:00
Sajith Sasidharan
ccffd78ac4 Add a comma, for consistency's sake 2020-05-05 09:27:09 -04:00
Sajith Sasidharan
f5dacf9547 Drop a comma introduced by mistake 2020-05-05 09:27:09 -04:00
Sajith Sasidharan
96c8c5e953 Link to storage server the way it used to be 2020-05-05 07:43:39 -04:00
Sajith Sasidharan
7d063995f5 Update copyright years 2020-05-04 15:35:21 -04:00
Sajith Sasidharan
4ebd6250e3 Document root.Root 2020-05-04 14:20:05 -04:00
Sajith Sasidharan
96449bb99b Ensure lists before conversion to dict 2020-05-04 14:05:33 -04:00
Sajith Sasidharan
bf0f8a736a Remove unused imports 2020-05-04 11:48:41 -04:00
Sajith Sasidharan
df9b160a3c Mark describe server method as static 2020-05-01 17:42:46 -04:00
Sajith Sasidharan
80a26e26b1 Refactor methods that describe server/connection 2020-05-01 17:41:51 -04:00
Sajith Sasidharan
7b4d81fe28 Rename root.Root variables 2020-05-01 17:38:24 -04:00
Sajith Sasidharan
ade7f613b8 Remove unused renderer 2020-05-01 17:07:08 -04:00
Sajith Sasidharan
df188c75df Wrap footer elements in tags 2020-05-01 16:50:30 -04:00
Sajith Sasidharan
029c99a241 Render introducers table using SlotsSequenceElement 2020-05-01 16:45:34 -04:00
Sajith Sasidharan
1ddf07d59d Render services table using SlotsSequenceElement 2020-05-01 16:45:04 -04:00
Sajith Sasidharan
0d8eda5e76 Rearrange imports 2020-05-01 16:07:30 -04:00
Sajith Sasidharan
053e614221 Import resource_filename from setuptools
Drop the nevow one
2020-05-01 16:07:21 -04:00
Sajith Sasidharan
e9796eb308 Match against root path first 2020-04-30 18:49:05 -04:00
Sajith Sasidharan
cfe4b2925e Remove an unused method and imports 2020-04-30 18:48:06 -04:00
Sajith Sasidharan
cce6f83054 Remove unused renderers 2020-04-30 18:47:13 -04:00
Sajith Sasidharan
80ba700247 Correct usage of fillSlots 2020-04-29 12:18:39 -04:00
Sajith Sasidharan
a885f14c43 Pass now_fn to RootElement 2020-04-28 11:47:18 -04:00
Sajith Sasidharan
8ce1512501 Render import path 2020-04-28 07:57:15 -04:00
Sajith Sasidharan
32e0c779b6 Add version renderer 2020-04-28 07:56:27 -04:00
Sajith Sasidharan
d064f6b2b7 Add "rendered at" renderer 2020-04-28 07:55:10 -04:00
Sajith Sasidharan
ed6970b168 Correct fill slots usage in connection status 2020-04-28 07:52:57 -04:00
Sajith Sasidharan
5d84a25f21 Add introducers row renderer 2020-04-28 07:50:03 -04:00
Sajith Sasidharan
5155befedc Rewrite total introducers 2020-04-28 07:48:28 -04:00
Sajith Sasidharan
44f16e77cf Add introducers renderer 2020-04-28 07:47:36 -04:00
Sajith Sasidharan
7ba4b945a4 Use introducers renderer method in root template 2020-04-28 07:43:41 -04:00
Sajith Sasidharan
8d4949f96b Render total introducers correctly 2020-04-28 07:42:57 -04:00
Sajith Sasidharan
a646c7decd Fix typo 2020-04-28 07:42:07 -04:00
Sajith Sasidharan
89980a039c Render total introducers 2020-04-28 07:41:29 -04:00
Sajith Sasidharan
2f53b2a67d Add connected introducers renderer 2020-04-28 07:17:22 -04:00
Sajith Sasidharan
164218cf57 Update service table renderer 2020-04-28 07:14:35 -04:00
Sajith Sasidharan
907e8ccf6b Use services renderer method in root template 2020-04-28 07:13:41 -04:00
Sajith Sasidharan
75d41843d7 Use transparent nodes 2020-04-28 04:59:46 -04:00
Sajith Sasidharan
3c4056a947 Replace nevow.static.File with twisted.web.static.File 2020-04-28 04:47:48 -04:00
Sajith Sasidharan
dcea7ea476 Render connected/known storage server status 2020-04-27 17:22:27 -04:00
Sajith Sasidharan
1713076a9d Render services 2020-04-27 17:19:19 -04:00
Sajith Sasidharan
39d616a971 Render helper furl prefix 2020-04-27 17:11:36 -04:00
Sajith Sasidharan
8b4c7296d7 Move helper state to a separate function 2020-04-27 17:07:09 -04:00
Sajith Sasidharan
332bd75fcc Render helper description 2020-04-27 17:03:52 -04:00
Sajith Sasidharan
622d156278 Render "connected to helpers" status 2020-04-27 17:01:37 -04:00
Sajith Sasidharan
a4f86181f9 Render introducer description 2020-04-27 16:55:10 -04:00
Sajith Sasidharan
c86d4341c8 Render "connected to introducers" status 2020-04-27 16:52:54 -04:00
Sajith Sasidharan
65b6daf990 Rewrite incident button using twisted tags 2020-04-27 16:44:06 -04:00
Sajith Sasidharan
110528f569 Handle path "/" when rendering root path 2020-04-27 16:44:06 -04:00
Sajith Sasidharan
f34cdb81ad Create RootElement 2020-04-27 16:44:06 -04:00
Sajith Sasidharan
1c17bb0674 Rewrite welcome page for twisted.web.template 2020-04-27 16:24:50 -04:00
Sajith Sasidharan
e2c6d288bf
Merge pull request #699 from sajith/3294.incident-reporter-to-nevow
Remove nevow from allmydata.web.root.IncidentReporter
2020-04-27 10:12:27 -04:00
Sajith Sasidharan
f02501eadf Update comment on HelperStatus 2020-04-24 10:08:45 -04:00
meejah
c385e958a8 Merge branch 'master' into ticket3252-port-web-directory.remaining.1 2020-04-23 12:24:00 -06:00
Sajith Sasidharan
18d5d3fc49 Wrap rendered nodes in tags 2020-04-22 18:23:43 -04:00
Sajith Sasidharan
65315c4ed0 Render a message when helper isn't running 2020-04-22 17:16:33 -04:00
Sajith Sasidharan
6661b52c33 Reformat helper.xhtml 2020-04-22 17:06:59 -04:00
Sajith Sasidharan
aafe89805d Document helper stats data format 2020-04-22 17:06:39 -04:00
Sajith Sasidharan
4bc7535d02 Derive HelperStatus from MultiFormatResource 2020-04-22 16:54:11 -04:00
Sajith Sasidharan
d844a8f89f Use twisted transparent tag to render data
This way the test suite will be happy, and we won't have extraneous
`<div>` tags in the rendered page.
2020-04-21 11:53:48 -04:00
Sajith Sasidharan
a0eb00b2cc Wrap renderer return values in tags 2020-04-21 11:53:48 -04:00
Sajith Sasidharan
1e3ba25cc3 Add some documentation to Statistics page 2020-04-21 11:53:48 -04:00
Sajith Sasidharan
652b3f5bc0 Use twisted.web.template to render Statistics page 2020-04-21 11:53:48 -04:00
meejah
f8a78c996a URL -> DecodedURL 2020-04-18 02:27:32 -06:00
meejah
73d0151e1b typo 2020-04-18 01:52:31 -06:00
meejah
018e161f19 don't allow trailing slashes
This makes /uri/xxx URIs invalid if they have a trailing slash.
It seems that the former Nevow implementation would allow this, and
some tests (and, notable, "tahoe backup") did rely on using URIs
of this style.
2020-04-18 01:52:18 -06:00
meejah
882c63dab9 methods shouldn't be named like classes 2020-04-18 01:52:18 -06:00
meejah
0acf0d2a7e no addslash here 2020-04-18 01:52:18 -06:00
meejah
bc2f5f8e88 functions shouldn't be named like classes 2020-04-18 01:52:18 -06:00
meejah
6ea6abdb1f no .format yet 2020-04-18 01:52:18 -06:00
meejah
fc4aec7b77 remove comment 2020-04-18 01:52:18 -06:00
meejah
2e9463bd08 compute 'is this a terminal request' differently 2020-04-18 01:52:18 -06:00
meejah
b0c138f7c0 remove empty segments instead of making multiple URI's valid 2020-04-18 01:52:18 -06:00
meejah
8c47b8e2a1 don't need object 2020-04-18 01:52:18 -06:00
meejah
088fcff442 better formatting 2020-04-18 01:52:18 -06:00
meejah
c6f4f0b7d5 betterize comment 2020-04-18 01:52:18 -06:00
meejah
8db16ff8e3 old-style class 2020-04-18 01:52:18 -06:00
meejah
b64f90bcd4 simplify 2020-04-18 01:52:18 -06:00
meejah
95e5029c34 more comment 2020-04-18 01:52:18 -06:00
meejah
d425baed89 remove irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
3c332fec2a empty-string, not None 2020-04-18 01:52:18 -06:00
meejah
733b7932ce clarify further; remove unused user of RenderMixin 2020-04-18 01:52:18 -06:00
meejah
ace99a1724 add clarifying comment 2020-04-18 01:52:18 -06:00
meejah
f9e3fdfaee use % instead of format 2020-04-18 01:52:18 -06:00
meejah
355c78f0d4 irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
98d8c52916 comment 2020-04-18 01:52:18 -06:00
meejah
db7939f766 irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
b81589ca22 irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
965fadb0df irrelevant comment 2020-04-18 01:52:18 -06:00
meejah
956d67b9b8 irrelevant comment 2020-04-18 01:52:17 -06:00
meejah
65ec212779 unused imports 2020-04-18 01:52:17 -06:00
meejah
757bcc5309 cleanup 2020-04-18 01:52:17 -06:00
meejah
203066e8fd better error-code 2020-04-18 01:52:17 -06:00
meejah
9732955eba spelling 2020-04-18 01:52:17 -06:00
meejah
74ce166463 use twisted-web APIs, not nevow 2020-04-18 01:52:17 -06:00
meejah
6415873f0b undo change 2020-04-18 01:52:17 -06:00
meejah
bc04c9b3db detech empty pathname components, hopefully the same way as Nevow 2020-04-18 01:52:17 -06:00
meejah
83a70bb6f3 some fixes 2020-04-18 01:52:17 -06:00
meejah
8268f764aa quote output, render GET 2020-04-18 01:52:17 -06:00
meejah
45bfe743d4 improve comment wording 2020-04-18 01:52:17 -06:00
meejah
c4f49bb377 children must be None on error 2020-04-18 01:52:17 -06:00
meejah
98005bab1f addSlash isn't a thing in twisted.web 2020-04-18 01:52:17 -06:00
meejah
a29f1bec9d doubly-quoted 2020-04-18 01:52:17 -06:00
meejah
effaa6500c filename goes in the dict 2020-04-18 01:52:17 -06:00
meejah
19baba226a Resource needs to be new-style 2020-04-18 01:52:17 -06:00
meejah
dc4669b5e7 fix name decoding 2020-04-18 01:52:17 -06:00
meejah
66f392f7d0 remove debug 2020-04-18 01:52:17 -06:00
meejah
410f0133ab correctly register top-level directory node page 2020-04-18 01:52:17 -06:00
meejah
921926239a Revert "fix getchild for directory"
This reverts commit 8f00f4d4ab2e7edd0ad60a6144e858ece4a4be1f.
2020-04-18 01:52:17 -06:00
meejah
b4d9bfea15 fix deep-stats results 2020-04-18 01:52:17 -06:00
meejah
7a36bdc523 delete 'move to different dir' because it also doesn't work on trunk 2020-04-18 01:52:17 -06:00
meejah
e2304326fd fix rename-form 2020-04-18 01:52:17 -06:00
meejah
d12078abe2 fix form 2020-04-18 01:52:17 -06:00
meejah
8b7e1c30ab remove debug 2020-04-18 01:52:17 -06:00
meejah
d381d3e92b better style 2020-04-18 01:52:17 -06:00
meejah
f4c8eb5e2f not required 2020-04-18 01:52:17 -06:00
meejah
71c97369f0 fix getchild for directory 2020-04-18 01:52:17 -06:00
meejah
8f32936c7a /file works 2020-04-18 01:52:17 -06:00
meejah
c2ff7e260b more ctx -> req 2020-04-18 01:52:17 -06:00
meejah
79c3f919ba cleanup 2020-04-18 01:52:17 -06:00
meejah
b51f144f87 another thing works 2020-04-18 01:52:17 -06:00
meejah
66c0c71a0d a thing works 2020-04-18 01:52:17 -06:00
meejah
ace73a9215 whitespace 2020-04-18 01:52:17 -06:00
meejah
9e0e25cbed WIP FIXME porting directory, need child_ refactor thing 2020-04-18 01:52:17 -06:00
meejah
fd4d2709a5 search-replace "n:" -> "t:" 2020-04-18 01:52:17 -06:00
Sajith Sasidharan
15131a9f71 Handle just POST requests in IncidentReporter 2020-04-17 15:44:39 -04:00
Sajith Sasidharan
a14cee5cce Remove nevow from allmydata.web.root.IncidentReporter
This change calls for an explanation:

- `RenderMixin` doesn't seem to be adding anything here, so it is
   gone.

- The web browser was unhappy without a charset in the response
  (Firefox 74 was anyway), so `content-type` header also gets a
  `charset=UTF-8`.

- Returning a Unicode string made nevow appserver unhappy, so it is
  just a `str`.  The precise error message was:

  exceptions.TypeError: ('Could not adapt', u'An incident report has been saved to logs/incidents/ in the node directory.', <InterfaceClass nevow.inevow.IResource>)

Fixes: ticket:3294
2020-04-17 15:44:39 -04:00
Sajith Sasidharan
3e7dea7dda Wrap renderer results in tags 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
9c7357bc61 Remove an extraneous directive
`t:data` is not really a Twisted template directive.  Added my
mistake, removing now.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
bae32179bf Remove StorageStatus.renderHTTP
This was added to please the test suite. Pleased to remove it!
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
554c477cea Prefix member variable with "_" 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
6c3256517a Use slots to render storage stats table 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
0cbe2871fd Give the suite the precise string it wants 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
7625d959bc Use <t:transparent> to render node nickname and id
CI did not like the old way, but it passed in my system.  Odd.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
36a486426e Mark format_recovered as static method 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
0382b1ec63 Use Unicode strings to render space 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
aab940f65f Remove redundant None-checks on self.storage
When no storage is up, `storage_running()` renderer will return a big
honking `no storage server running` message, and no further renderers
will be invoked.  Therefore the extra defense is probably not
required.

(I tested this hypothesis.  The extra defense is not required, unless
there's something I have not seen.)
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
e2fc1fc07e Move renderSynchronously to test suite 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
7a053ddeff Use explicit None-check on self.storage 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
9b51bdf7fa Return result from renderHTTP
Bogus renderHTTP, but test failures are now down to three. We just
need to handle requests for JSON now.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
6e9a4e30d7 Add a docstring 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
f22417e51b Rename function for clarity 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
227d06fe64 Add docstrings to StorageStatusElement 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
b1c78244ab Use parentheses in import statement 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
2df2ae92d5 Fix test_storage.WebStatus.test_no_server failure 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
b14f36082c Use <t:transparent /> within table cells 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
d46df30bd0 Use render_space methods to render space 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
0993e61046 Drop unused ctx argument from render_space methods 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
c7a63f957d Refactor so that test_util pass 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
c88c97aad5 Use right syntax for twisted.web.template tags 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
4e81a3a0a2 Check storage server status before using it 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
c019c7e955 Second version of renderSynchronously 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
d3790a4d42 Add missing flattenString import 2020-04-17 15:25:42 -04:00
Sajith Sasidharan
b29652e0f0 Add StorageStatus::renderSynchronously
Related to ticket:3247

test_storage.py wants a `StorageStatus::renderSynchronously()` method
and a `StorageStatus::renderHTTP()` method.  Let us begin with the
goofy first-cut.

Both these methods are not only wrong, but they will also not please
the test suite.  However error messages produced in CI can be shared,
and that way I can hopefully get unstuck.
2020-04-17 15:25:42 -04:00
Sajith Sasidharan
d142ccb159 Use twisted.web.template in web/storage.py
Related to ticket:3247.  Nevow usage has been removed, and generated
page looks the same as its former self, but tests are failing because
test_storage.py assumes that we're using nevow.
2020-04-17 15:25:42 -04:00
Jean-Paul Calderone
ef73e18f3d
Remove the greater part of the implementation 2020-02-13 10:43:50 -05:00
meejah
67bd9c0b2f refactor capability-checks 2019-12-21 16:01:23 -07:00
meejah
a21e31aed8 irrelevant comment/assignment 2019-12-21 03:57:00 -07:00
meejah
bffc2f9f2c already new-style, better docstring 2019-12-21 03:57:00 -07:00
meejah
14a39821be use hyperlink, better unicode 2019-12-21 03:57:00 -07:00
meejah
8f5e9089ca timedelta, not int 2019-12-21 03:57:00 -07:00
meejah
7ccfe44be6 port manifest to twisted.web.template 2019-12-21 03:56:13 -07:00
meejah
4a73f8055c imports whitespace 2019-12-21 03:56:13 -07:00
Jean-Paul Calderone
1fef619819 Add a test for persistent state and make it pass 2019-11-19 12:56:38 -05:00
Jean-Paul Calderone
c80c753e5d Late bind storage so init_storage can run after init_web 2019-11-08 14:12:38 -05:00
Jean-Paul Calderone
c2257685c2 Merge remote-tracking branch 'origin/master' into integration/storage-economics 2019-11-08 10:42:26 -05:00
Jean-Paul Calderone
8c1f536ba4 Merge remote-tracking branch 'origin/master' into integration/storage-economics 2019-10-04 12:02:00 -04:00
meejah
2b4b8e11ce urls are bytes in Twisted 2019-09-27 12:41:14 -06:00
meejah
4a226c7633 use Twisted API, and some hypothesis tests 2019-09-27 11:51:03 -06:00
meejah
dc19e7379e validate capability before doing anything 2019-09-27 11:51:03 -06:00
meejah
488e40ce86 unused import 2019-09-27 11:51:03 -06:00
meejah
da882df23b comment 2019-09-27 11:51:03 -06:00
meejah
a7c8407127 use hyperlink.URL instead of custom code 2019-09-27 11:51:03 -06:00
meejah
24faca46a9 more-correct URI 2019-09-27 11:51:03 -06:00
meejah
c507971e62 unused import 2019-09-27 11:51:03 -06:00
meejah
6195b2680b fix up ctx/req and add docstrings 2019-09-27 11:51:03 -06:00
meejah
2897b5767e do the weird redirect thing properly 2019-09-27 11:51:03 -06:00
meejah
0f6fc706ed port URIHandler to twisted.web 2019-09-27 11:51:03 -06:00
hab
029695399a
Merge pull request #652 from habnabit/move-to-twt--info
Port allmydata.web.info to twisted.web.template
2019-09-17 12:22:22 +01:00
meejah
9050fdcea6 explicitly save refs to webish and operations (instead of using Service methods) 2019-08-24 12:31:08 -06:00
meejah
168bf33e1c remove comment 2019-08-20 00:18:14 -06:00
meejah
0a5aa61a70 must be new-style class (and I guess Resource isn't?) 2019-08-20 00:18:14 -06:00
meejah
ec70fa7090 fail gracefully on invalid URLs 2019-08-20 00:17:28 -06:00
meejah
a307adb7f5 there's no download timeline anymore 2019-08-20 00:17:28 -06:00
meejah
ba9a4e590b remove debug 2019-08-20 00:17:28 -06:00
meejah
baa773588e comment 2019-08-20 00:17:28 -06:00
meejah
3f8954be08 refactor download status to get rid of a 'def child_' 2019-08-20 00:17:28 -06:00
meejah
569454b1a3 get rid of child_operations from root 2019-08-20 00:17:28 -06:00
meejah
385df39981 get rid of .remember() / IOpHandleTable 2019-08-20 00:17:28 -06:00
meejah
217e32e385 make '/operations' work again 2019-08-20 00:17:28 -06:00
meejah
9e999d0c68 work around lack of getChild in nevow.rend.Page 2019-08-20 00:17:28 -06:00
meejah
d873a041bf remove some child_ usage 2019-08-20 00:17:28 -06:00
meejah
48cb51097f keep using Page 2019-08-20 00:17:28 -06:00
meejah
5cdf5a667a more hacky test 2019-08-20 00:17:28 -06:00
meejah
3a2182309d whitespace 2019-08-20 00:17:28 -06:00