1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00

136 Commits

Author SHA1 Message Date
Andrew Bartlett
f3db23ac75 r12928: This patch improves the interaction between the vampire and provsion code.
Previously, we had to know (or guess) the host and domain guid at the
provision stage.  Now we query the database post-provision, to extract
the values and fill in the zone file.

This allows us to generate a correct zone file in the Windows migration case.

In an effort to make SWAT easier to use, I have removed and renamed
some of the provision options.

I have also fixed a nasty issue in my js code.  I had implictly
declared a global variable of the name 'join', with disasterious
results for any subsequent user of the string utility function:

esp exception - ASSERT at lib/appweb/ejs/ejsParser.c:2064, 0

Backtrace:
        [ 0]       substitute_var:20   ->               list[i] = join("", list2)
        [ 1]           setup_file:9    ->       data = substitute_var(data, subobj)

Andrew Bartlett
(This used to be commit a38ceefd11f8b748f30383ef36a4752f178bfca1)
2007-10-10 13:51:07 -05:00
Andrew Bartlett
58f78fa182 r12892: Add a 'Migrate from Windows' page to our installation section in SWAT.
Doing this required reworking ejsnet, particularly so it could take a
set of credentials, not just a username and password argument.

This required fixing the ejsnet.js test script, which now adds and
deletes a user, and is run from 'make test'.  This should prevent it
being broken again.

Deleting a user from ejsnet required that the matching backend be
added to libnet, hooking fortunetly onto already existing code for the
actual deletion.

The js credentials interface now handles the 'set machine account' flag.

New functions have been added to provision.js to wrap the basic
operations (so we can write a command line version, as well as the web
based version).

Andrew Bartlett
(This used to be commit a5e7c17c348c45e61699cc1626a0d5eae2df4636)
2007-10-10 13:50:59 -05:00
Andrew Bartlett
992f274d2e r12887: Add the icon from samba.org to SWAT.
Andrew Bartlett
(This used to be commit 630b4b4dc516fc28c74f815a0c1fb467ec576029)
2007-10-10 13:50:58 -05:00
Andrew Bartlett
a6a007d0c4 r12826: The base DN is very tied to the realm. Allowing it to be changed here
only allows stuffups, but doesn't benifit anyone.  (If we were to
allow it, we should have it change every time the realm is modified,
character by character).

The command line provision script doesn't allow this either.

Andrew Bartlett
(This used to be commit fd176997b691ecf8a1126b0afba3a5cb28818ed1)
2007-10-10 13:50:02 -05:00
Andrew Bartlett
75ef0ba513 r12823: Fix up the provison and newuser code in SWAT. This also cleans up the
main provision script a bit, as the argument list was getting out of
control.  (It has been replaced in part with an object).

This also returns the session_info from the auth code into ejs.

We still need access control allowing only root to re-provision.

Andrew Bartlett
(This used to be commit 002cdcf3cab6563909d31edc5d825e857dc0a732)
2007-10-10 13:50:02 -05:00
Andrew Bartlett
8f86ddcd93 r12819: Fix swat authentication again. We need to pass the socket_address
structure around, so the auth code knows where the request came from.

Andrew Bartlett
(This used to be commit 7a7b2668c00d4d22bcf8aa3ba256af88f70c38c4)
2007-10-10 13:50:01 -05:00
Andrew Bartlett
8f4dc51345 r12739: Add support for using credentials in the provision process.
This should allow us to provision to a 'normal' LDAP server.

Also add in 'session info' hooks (unused).  Both of these need to be
hooked in on the webserver.

Andrew Bartlett
(This used to be commit b349d2fbfefd0e0d4620b9e8e0c4136f900be1ae)
2007-10-10 13:49:48 -05:00
Andrew Bartlett
daa4cce71d r12232: I hate SWAT code being outside 'source'. Add in code to push the
user's session info into ldb structure for the ldb tests.

Andrew Bartlett
(This used to be commit 4e1a60a24f7c38170a22d6092b4d5392f5bca5d3)
2007-10-10 13:47:22 -05:00
Deryck Hodge
3afbbc7bae r10228: Reorganizing a bit, trying to simplify. This is an attempt
to find what's going wrong in IE formatting.

This is some better, but still IE needs help.

deryck
(This used to be commit e7015c19374e1db8165790c623cb45e33b0a92df)
2007-10-10 13:38:09 -05:00
Deryck Hodge
f7451dbaef r10225: Adding back a style rule to qooxdoo that was originally
removed.  This is a cross browser hack that makes for
better performance amone differing browsers.

deryck
(This used to be commit b10d1d522cab53f50d7b3268b617c68e51b411a5)
2007-10-10 13:38:09 -05:00
Deryck Hodge
234481fd40 r10212: An IE fix. Must set initial values in the onload function.
deryck
(This used to be commit 3264ccf7438e003c3ed217f2d4a7315aceb05eb1)
2007-10-10 13:38:08 -05:00
Jelmer Vernooij
342d229b40 r10190: Do some very basic input checking when provisioning.
(This used to be commit 87f25fe49caa78422582337c5208a331ef5b8c15)
2007-10-10 13:38:06 -05:00
Jelmer Vernooij
52bcf4c5a3 r9831: Check whether the two admin passwords entered were equal.
(This used to be commit d02834f88d6a26f77549ec9db8f2492eacc9b043)
2007-10-10 13:36:16 -05:00
Jelmer Vernooij
f58a74aaba r9816: Work on testsuite for upgrade
Add 'paths' object to provision code.
(This used to be commit 488d737fb0ebbc2535d0ec17c14f0dc1eaf2a578)
2007-10-10 13:35:04 -05:00
Deryck Hodge
37db11885d r9779: Add a contextmenu function to be used by all window/widget objects.
deryck
(This used to be commit f0c7b43767b713f15d9c50fc744da0a6582618b2)
2007-10-10 13:35:00 -05:00
Deryck Hodge
33f4328c69 r9763: Add the start bar as a widget from the
desktop file.  This is more portable to IE, though
there are still some IE issues hanging around.

deryck
(This used to be commit a70b52bb04689de90ee5ec59109d669175b91c04)
2007-10-10 13:34:57 -05:00
Deryck Hodge
721b22f9cd r9761: Move initial widget setup to desktop library. Now, just by including
desktop.js, you get the basic desktop layout.

deryck
(This used to be commit 6acc7ec7c2957e1487ee72f883079e1680dd9896)
2007-10-10 13:34:57 -05:00
Deryck Hodge
c1909be224 r9759: Create some wrappers for QxWidget. This gives us some pre-fabbed
windows, which set size and positioning.

To use:

var myWin = new Window.large("Some Window Title");
var myWin = new Window.standard("Some Window Title");
var myWin = new Window.small("Some Window Title");

You can omit the title if you don't need one.  Also,
var myWin = new Window();  will give you the random
positioning and no predetermined sizing.

deryck
(This used to be commit 92d6bb90a64591b13f4d1bec77ebebcd1198914d)
2007-10-10 13:34:57 -05:00
Jelmer Vernooij
c9ace93ce2 r9756: One-way upgrade from Samba3->Samba4 basically works now
Still need to polish some rough edges
(This used to be commit a8f309aa812533f57a90410722dfb342c8cf3b48)
2007-10-10 13:34:56 -05:00
Jelmer Vernooij
11f3f0fa6c r9754: Upgrading with the command line utility now works, at least partially (-:
Upgrading using SWAT should work as well now.
(This used to be commit 8baa2ac377315ae8b365f58c2bda0bf3d0c5aec3)
2007-10-10 13:34:56 -05:00
Jelmer Vernooij
0549763600 r9735: More work on generating a valid Samba4 configuration using the
Samba3 data (both console and SWAT)
(This used to be commit d569465dc4def55c27878028f2fc762960f453d8)
2007-10-10 13:34:55 -05:00
Jelmer Vernooij
d6cd54fb0a r9718: Work a bit on the SWAT interface
(This used to be commit b1844905d2c1ca26aef0ccba799ff16383348fc1)
2007-10-10 13:34:53 -05:00
Deryck Hodge
707a237e76 r9710: Filename change for clarity's sake.
deryck
(This used to be commit 4acd4489c9f016f7f48ba1cff231cbfc56925547)
2007-10-10 13:34:52 -05:00
Andrew Tridgell
0a579e4ae5 r9674: r9678@blu: tridge | 2005-08-27 16:32:30 +1000
- removed the initial provision button. It is just way too confusing.
 We should have a separate 'migration' page instead, but in the
 meantime to migrate please use the command line

 - added a check for a blank password. If blank, then ask them
  to reenter it
(This used to be commit 2673bebf138a9bda79f99dd5caff93dd6db24658)
2007-10-10 13:34:39 -05:00
Deryck Hodge
bcc288d880 r9668: Cross-browser fix for IE, when adding scripts on the fly.
deryck
(This used to be commit 1f4e65ce96ec8c4335bfabbe54989a8cb431d773)
2007-10-10 13:34:38 -05:00
Deryck Hodge
25c3942623 r9663: Portability fix for IE.
deryck
(This used to be commit 87cb23aae377a9cdce790881c65535ed4d3931e1)
2007-10-10 13:34:38 -05:00
Deryck Hodge
44a27265fb r9651: Start to group all SWAT specific windowing, widgets, etc. in one
file.  This allows basic style and event code to be set in one place,
though we'll still have to override for a specific position or look.

More to come...

deryck
(This used to be commit 9d5482d2aaff2082d85d626c288f2ad16e20b6ae)
2007-10-10 13:34:38 -05:00
Deryck Hodge
c6b592a5b7 r9635: Seperate window logic from registry js file.
This allows for flexibility in display format,
which will make more sense when I start working
on windows, tabs, etc.

Add the beginnings of a document.js object that allows
us to add and remove scripts as we use them, which will
ensure we only load what we need.  A desktop GUI runs
from a single page, so we can't load js files by changing
pages.

deryck
(This used to be commit b4f6f81d7bbf87fcb7c7c9bd4a7164aabaeedc1c)
2007-10-10 13:34:36 -05:00
Andrew Tridgell
7f5bb2b866 r9610: use a list of allowable extensions for unauthenticated access rather than
a list of file names
(This used to be commit ef61c8de2fa62d37486ea93d5773198d21c1a2c4)
2007-10-10 13:34:34 -05:00
Deryck Hodge
9dfffdf4c0 r9579: Desktop SWAT opens now with a little server status window.
This includes a table layout that can be reused (see
QxListView in status.js).

Some formatting fixes, too.

deryck
(This used to be commit f95bf0adf760b8799ec02ec68ce42516ca40b6d2)
2007-10-10 13:34:31 -05:00
Andrew Tridgell
27a09eaaab r9501: fixed the SWAT login page for the changes to the userAuth() function that Mimir made
earlier today
(This used to be commit 10b1f95790f2769cdc0e1c6f051cb7cc73f07d69)
2007-10-10 13:34:23 -05:00
Andrew Tridgell
f5f18f2d18 r9498: converted the SWAT regedit backend code to use the OO calls
(This used to be commit c22baee5aafb2937ddfb71942eef5c69544e823c)
2007-10-10 13:34:22 -05:00
Deryck Hodge
535c6fa436 r9471: Rough first pass at a menu system. It's hacked together, but
I wanted to just get it working to play with it.  Only the
reg editor works from this menu.  The rest will follow later.

deryck
(This used to be commit 93e648ade28eb7e0fd147fdde281b3edfb2e9367)
2007-10-10 13:34:19 -05:00
Andrew Tridgell
656a885c22 r9470: non-working attempt to add a little table for values to the reg editor
hopefully deryck will be able to tell me what I've screwed up :-)
(This used to be commit e68db751f064a0d968bd0995805141ffe5938ee7)
2007-10-10 13:34:19 -05:00
Deryck Hodge
8005114fda r9469: Add a right-click menu to the SWAT desktop.
This includes a generic showMessage() for opening
a dialog window to the user.

Next is a start menu, and then I'll move on to more
practical functionality... user manager, server config, etc.

deryck
(This used to be commit eeacd73ef2da16337f2968aec86f9f9313085c25)
2007-10-10 13:34:19 -05:00
Andrew Tridgell
f35e72d9ca r9466: add display of values as well as keys in the registry editor
(This used to be commit 62d55a250afa3e3923a6b9da7b59177ad59d55a3)
2007-10-10 13:34:19 -05:00
Andrew Tridgell
f4aa80d88f r9465: handle encoding and decoding of pointers, representing them as a
string containing "(POINTER)"
(This used to be commit 6f69eeb8f258063f1ac911ab38e667e7743ccba3)
2007-10-10 13:34:18 -05:00
Deryck Hodge
375d11ac78 r9443: We can now move windows around anywhere on our SWAT "desktop".
QxWidget doesn't accept percentages, so I feed the toplevel
widget the actual brower height/width onload and onresize.

deryck
(This used to be commit dadc89f8839b5c481ba47eeadec9f7bf4d3e14a9)
2007-10-10 13:34:15 -05:00
Andrew Tridgell
2997f4bd43 r9434: moved the registry editor into a common js library. Deryck, does this
look ok? Apologies if this treads on your toes.
(This used to be commit 8295eb01c0e1eec4f7c5bd211eac80b92ff9549e)
2007-10-10 13:34:14 -05:00
Deryck Hodge
d9c4ff9ef0 r9397: Playing with qooxdoo a bit and saving my work, so I
can get to it later today at work.  Not much to see yet,
and not linked to from SWAT yet.

Playing with the idea of a web-based desktop, and just
seeing how widgets can be used.

deryck
(This used to be commit 435467f90d809899c3d0efeaf991fb659d97202d)
2007-10-10 13:33:34 -05:00
Deryck Hodge
3029657053 r9328: Remove background:ThreeDFace from qooxdoo styles to
get our samba.org background bacl.

deryck
(This used to be commit 71291f0d566eaa493a5687a6bce7c5ec9373a7de)
2007-10-10 13:33:24 -05:00
Deryck Hodge
a9c00a7a72 r9327: Rename parent to fParent to prevent confusion with window.parent object.
(Thanks, Derrell, for the reminder.)
Rename child to fChild, to be consistent and maintain readability.

deryck
(This used to be commit 6040f9401eedb195aef160b3b58462a1a6728af7)
2007-10-10 13:33:24 -05:00
Deryck Hodge
f870014fc3 r9232: Rename some objects to make code clear.
deryck
(This used to be commit 8a3445499e3f913693196aa1d1b5bbeec5469cf2)
2007-10-10 13:31:34 -05:00
Deryck Hodge
55024676c7 r9230: Star out passwords and add confim text input for provisioning.
Also, add addMethod() to form elements now.

deryck
(This used to be commit 79f276df47ebc93e1505c7411fb1acd4b004047c)
2007-10-10 13:31:34 -05:00
Andrew Tridgell
d3751c4525 r9228: cleanup and simplify the AJAJ code - part 2
(This used to be commit bb3ab2c47b098ed57af358c4f5c6ad4d4d26eb33)
2007-10-10 13:31:34 -05:00
Andrew Tridgell
8942ac69f0 r9227: cleanup and simplify the AJAJ code
(This used to be commit ceb7669e5991e9dda759d60a09a0a65e6caba991)
2007-10-10 13:31:34 -05:00
Andrew Tridgell
32015e5cdc r9213: some improvements to the registry editor code
(This used to be commit 5cd33fa9f898f95a78397a387a42977a4839fb20)
2007-10-10 13:31:32 -05:00
Andrew Tridgell
c8dfaec28a r9212: the beginnings of a registry editor in SWAT, using client side javascript and AJAJ
This doesn't work at all well yet, mostly because of my inexperience
with client side javascript and what events are available
(This used to be commit 8073e84c7a5fd8d483685d769661c790a803ff49)
2007-10-10 13:31:31 -05:00
Andrew Tridgell
2dcd55f31f r9211: don't try to encode functions in the AJAJ object encoder
(This used to be commit a08104a13c722b3888aecd365e32aae63ea481e5)
2007-10-10 13:31:31 -05:00
Andrew Tridgell
c28816e74b r9177: setup a credentials object in authinfo on login
(This used to be commit c1ef18a590d2f7af4b64c1775376a05da80ac242)
2007-10-10 13:31:28 -05:00