Commit Graph

29 Commits

Author SHA1 Message Date
mpl 7059a616c0 show server status on index page
We're only showing build version for now.
Next step would be status handler.

See http://camlistore.org/issue/111

Change-Id: I9e0792abe9ffed8139d38478d186b6e75f99de7e
2013-06-09 18:46:24 +02:00
mpl 11a3f78691 WIP: switch from ui to newui
This CL proposes 4 changes:

1) When making the embeds, any .html files in newui is rewwritten
on the fly so that the resulting embed uses all.js instead of
individual .js files. all.js is the only javascript file embedded
for newui.

2) Various bugs and paths in the newui/*.js files were fixed so that
everything works when using all.js

3) pkg/server/ui.go was modified so that all features from ui should
now have an equivalent in newui, that is served through ui/new/.
In a next step, we can move back everything from newui/ into ui/ and
completely get rid of the old ui.

4) The published gallery now uses closure too.
In another next step, we should probably work on serving its static
part directly from an .html file or (include it in the zembed somehow?)
instead of generating it at every request. Or at least cache it?

This commit includes the zembeds in newui, except for zembed_all.js.go
since it is large and it would take a lot of space in the git history
everytime we change it.
The plan is to roll-sum it into chunks to address that problem.

Change-Id: I381d8ddf3a2bbe37e3c4b1c4bf423f16beffaaf4
2013-06-04 16:34:51 +02:00
mpl ac431439f3 Allow HTTPS with a self-signed certificate.
A new client configuration parameter, "trustedCerts" (list of strings)
is introduced. A certificate fingerprint is defined as the 10 digits
prefix of the sha1 of the whole certificate (in ASN1. DER form).
trustedCerts should contain the list of fingerprints of the
certificates we trust. If not empty, the server's certificate
is checked against that list, instead of using the full x509 validation
on it.

-added a dial function and tls configuration, which check if we're using
SSL, and if we're in "trustedCerts" mode.
pkg/client/client.go
pkg/client/config.go

-moved android specific hacks from camput to the client layer, so that
the dial and tls config could reuse/access them. Also allows future
reuse for other commands, such as camget.
pkg/client/android.go

-adapted camput to the above changes:
cmd/camput/android.go
cmd/camput/camput.go
cmd/camput/files.go

-server prints a hint when it generates the self-signed:
pkg/misc/misc.go
server/camlistored/camlistored.go

-camliactivity:
clients/android/res/xml/preferences.xml
clients/android/src/org/camlistore/Preferences.java
clients/android/src/org/camlistore/SettingsActivity.java
clients/android/src/org/camlistore/UploadService.java
clients/android/src/org/camlistore/UploadThread.java

http://camlistore.org/issue/131

Change-Id: I6be20161549a69aafc8eb7b9e96e9351dc1c5b09
2013-04-23 17:10:37 +02:00
mpl f21cea5131 share: refactored
-pkg/server/share.go handles share(d) blobs.
-pkg/blobserver/gethandler no longer deals with share blobs
and has been rewritten like the other handlers (no more auth
in there).
-client and signhandler changed accordingly.
-serverconfig: auth moved up in makeCamliHandler
-share parameter added to the user level and low level config.
-share URL is now http(s)://host[:port]/[prefix/]share/sha1-xxxx.

Addresses http://camlistore.org/issue/107

Change-Id: I0a2c07ac1a1e435b141702e0ff06dc8182721d65
2013-03-06 19:11:00 +01:00
Brad Fitzpatrick 4be9f2f264 serverconfig: fix test on OS X
Change-Id: Ic5a8f820abe3cad920a18991cc21b5386fdf9553
2013-01-11 10:52:22 -08:00
Brad Fitzpatrick 6ca0efac8c camlistored: much better sqlite support, by default, and help/docs/hints 2013-01-10 16:16:10 -08:00
Brad Fitzpatrick 642613ebfc serverconfig: sqlite support and general cleanups. 2013-01-10 15:29:08 -08:00
mpl 03ca023b03 serverconfig: make the localdisk optional, so that
s3 can be used as the primary blobserver.

Fixes http://code.google.com/p/camlistore/issues/detail?id=81

Change-Id: I12a7eb9a3dafc885eaaf14ba8da8716a6440416a
2013-01-10 23:14:56 +01:00
Brad Fitzpatrick 5aefa82fab genconfig: s3 config support
Change-Id: I6681d8dffee01ac4a50118377b4172fd2f331049
2012-12-21 16:13:36 -08:00
Brad Fitzpatrick ff960933e6 serverconfig: minor cleanup
Change-Id: I6e25c4392303200c3bbe33b3d32239491436cbb0
2012-12-21 15:47:08 -08:00
mpl 40bd73ee07 move discovery from /ui/ to / in genconfig too
Change-Id: I1a020696e64c58f911e85070263c015bdbd2be1c
2012-11-08 15:27:17 +01:00
Brad Fitzpatrick 39d8df7bb2 serverconfig: docs and unexport GenLowLevelConfig 2012-11-07 17:51:42 +01:00
mpl 295cbade1b Add postgres support
Also added the -short option for make presubmit
because postgres test is too slow.

Change-Id: I6be21c4d4cd67671eb44ab65333fc32c1e261bbd
2012-11-03 19:59:22 +01:00
mpl 8138cf8fd6 mongo: added user:pass style authentication
The mongo indexer didn't have any authentication
scheme, so this change adds the user:pass@host
authentication.
The mongo indexer tests now use the root:root
credentials.

Change-Id: I7867f46e3b5f0a4a1a50f86f26d76c0bfd69e9ac
2012-10-25 00:35:19 +02:00
Brad Fitzpatrick 7fba04d71a Compile with Go tip again.
See https://groups.google.com/forum/?fromgroups=#!topic/golang-dev/yULJVYAbIzg

Change-Id: I11e8dd99a9ec4a065f03b888b616c13e5ce0e92c
2012-10-19 12:51:10 -07:00
mpl 94cb8cf05a Be consistent between high and low level configs for https
Change-Id: Ie7e1d9c554e09a34416a2ae3ac9e10f1a2f8fce0
2012-10-18 11:58:30 +02:00
mpl 844551d0b2 If baseURL was not user defined, this change makes sure it is
dynamically defined from incoming requests.
The listen flag has moved from pkg/webserver to server/camlistored
and is not using runsit anymore.
httputil.ServerError now only outputs the full error if we're
in internal/debug mode.
http://code.google.com/p/camlistore/issues/detail?id=53

Change-Id: I55a1c6d43a549d9ee2022742a83aa142dc19e02a
2012-10-15 16:26:50 +02:00
Brad Fitzpatrick 11842fcf33 serverconfig: let baseURL and listen be optionally separate 2012-08-04 21:42:10 +10:00
Brad Fitzpatrick 42833a76e0 serverconfig: be consistent between low- and high-level config
Use TLSCertFile and TLSKeyFile in both.
2012-08-04 21:11:52 +10:00
Brad Fitzpatrick 493f75a72e serverconfig: allow configuring TLS cert/key 2012-08-04 11:12:39 +10:00
mpl da73bef166 support user provided rootNode for published entities
Change-Id: I54810bded2cc03f320e1081945ff5cb2fce0d852
2012-05-02 16:18:05 +02:00
mpl 2a844730b3 support for published entities in genconfig and in wizard
Change-Id: I1768dac9628edb59cf0b987e9054b920d234b36b
2012-04-23 21:00:05 +02:00
Brad Fitzpatrick fbeb934c17 serverconfig: remove hard-coded search owner in genconfig.
Change-Id: I9161bcab5f9deb2ac8b0691c6858ae8615f435ab
2012-04-12 11:39:53 -07:00
Brad Fitzpatrick 7b8105d561 serverconfig: fix generated low-level config for mysql indexer
Change-Id: I8376bf134cf234b1a671aaacffba98fe5eaf3271
2012-04-11 19:22:02 -07:00
mpl 8466cd9e44 wip: setup wizard
Change-Id: I9989f7ff3981eb7c9025bbb9bd174cc92862af35
2012-04-06 19:29:58 +02:00
Brad Fitzpatrick 125c33f019 camlistored: auto-generate a secring/keyId for new users, without gpg
Change-Id: Ib653f9cb5fa0f5e4730854dfaea6c4654f94f377
2012-03-19 21:31:20 -07:00
Brad Fitzpatrick 81ac8e61ec serverconfig: don't hard-code .camli in default secring path
Change-Id: Id174acaa5aa080e1c021c5032d1aa7cf45501b3e
2012-03-19 13:49:41 -07:00
Brad Fitzpatrick 73cd34a6a0 serverconfig & camlistored: simplify low/high-level config bootstrapping.
Change-Id: I22e003ff2eaa29b09a5c4cbb59afa1ca9bd624df
2012-03-19 13:09:00 -07:00
mpl 7f630657d5 generate low level configuration
Change-Id: I43d1610bdc386954dea724b4b38e184bf16e2d34
2012-03-16 00:05:24 +01:00