diff --git a/.gitattributes b/.gitattributes index 3c93bcf..0833179 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,23 +4,23 @@ # Force the following filetypes to have unix eols and encoding, so that Windows does not break them. # If a file is going to be used on linux and windows, we want it invariant, # rather than automatically translated, because automatic translation always screw things up. -* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -.gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -.gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=bash -*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=cpp -*.rs text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=rust -*.py text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=python -*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=html -*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=html -*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=markdown -*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=css -*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +* text=auto eol=lf encoding=utf-8, whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitignore text eol=lf encoding=utf-8, whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitattributes text eol=lf encoding=utf-8, whitespace=trailing-space,space-before-tab,tabwidth=4 +.gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=bash +*.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=cpp +*.rs text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=rust +*.py text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=python +*.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.html text eol=lf encoding=utf-8 whitespace=space-before-tab,tabwidth=4 diff=html +*.htm text eol=lf encoding=utf-8 whitespace=space-before-tab,tabwidth=4 diff=html +*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=markdown +*.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=css +*.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 makefile text eol=lf encoding=utf-8 diff --git a/.gitmodules b/.gitmodules index a63383b..96a5d30 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "libsodium"] path = libsodium - url = ../libsodium.git + url = git://rho.la/libsodium.git branch = rho-fork [submodule "mpir"] path = mpir - url = ../mpir.git + url = git://rho.la/mpir.git branch = rho-fork [submodule "wxWidgets"] path = wxWidgets - url = ../wxWidgets.git + url = git://rho.la/wxWidgets.git branch = rho-fork diff --git a/README.md b/README.md index c860dcc..d81f3ca 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,77 @@ ---- -title: >- - README ---- +About +----- + +Wallet is open source software intended to become the manager of hierarchical + deterministic keys for a social network that a superset of the Bitmessage social net, + for securely pseudonymous uncensorable public communication, + and securely private communication. (Telegraph looks like +it will not be private for much longer). + +You cannot have truly end to end encryption, except you control your own keys directly. + +To make an actually useful social net requires a lot of engineers doing a lot of work, which requires funding, which requires a a profit model. The current business plan being to [eat SWIFT's lunch](./docs/manifesto/SWIFT.html), by creating an environment in which one can create and operate the necessary Daos. + +The rest of the documentation is in Pandoc markdown, rather than Gitea or Github markdown, so you will have to build it before any of these links work. [pre alpha documentation (mostly a wish list)](docs/index.htm) [copyright © and license](./license.txt) + +Prerequisites +--------- + pre-requisite, Pandoc to build the html documentation from the markdown files. -Windows pre-requisites: Visual Studio and git-bash +Windows pre-requisites: Visual Studio and git-bash. This software is supposed to be cross platform, and is unlikely to get traction with highly motivate early adopters unless it is cross platform, but currently only builds on Windows. + +Download +--------- To obtain the source code from which the project can be built, including this README.html, from the bash command line (git-bash in windows). ```bash -git clone --recurse-submodules missing url +# assuming Pandoc is installed, and git-bash if you are on +# windows +git clone --recurse-submodules https://gitea.rho.la/cheng/wallet.git +wallet/docs/mkdocs.sh ``` -To build the docs, you need pandoc on the path. +The above download relies on `https` for security, but `https` is vulnerable to enemy action by any adversary sufficiently powerful to have a certificate authority in his pocket, so our identity model relies on ssh keys, not domain names, so if you intend to make contributions, it would be preferable to create an account on `gitea.rho.la` with a fake email, +upload your ssh public key to that account, and clone using `ssh` instead of `https` -```bash2 -cd wallet/docs -./mkdocs.sh +```bash +git clone --recurse-submodules gitea@gitea.rho.la:cheng/wallet.git +wallet/docs/mkdocs.sh ``` +To build the docs, including the license file, you need Pandoc on the path. + +```bash +cd wallet +docs/mkdocs.sh +``` + +Setup +------ + To configure and build the required third party libraries in windows, then build the program and run unit test for the first time, you need to have Visual studio build tools at their default location) -```bash2 +```bash cd wallet -./winConfigure.bat +msvc/winConfig.bat ``` Or, if you are in the command shell or power shell, ```bat -.\winConfigure.bat +msvc\winConfigure.bat ``` -After a pull from remote in which the submodules have changed, the pull -fails to automatically update the submodules by default, and when you -switch or checkout branches, the switch fails to automatically switch -and checkout the brances. - -After a pull that gives you a status of modified submodules. +After a pull that gives you a status of modified submodules, a to fix the submodules ```bash git submodule update --init --recursive --remote diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html new file mode 100644 index 0000000..f6675d5 --- /dev/null +++ b/RELEASE_NOTES.html @@ -0,0 +1,52 @@ + + + + + + + Release Notes + + + + + + + +
+ + logo +
+
+ +
+
+ readme + license + notice + release notes +
+
+

Release Notes

+

To build and run README

+

pre alpha documentation (mostly a wish list) (In order to read these on this local system, you must first execute the document build script mkdocs.sh, with bash, sed and pandoc)

+

This software is pre alpha and should not yet be released. It does +not work well enough to even show what it would do if it was +working

+

Creative Commons License reaction.la gpg key 154588427F2709CD9D7146B01C99BB982002C39F
This work is licensed under the Creative Commons Attribution 4.0 International License.

+ + diff --git a/docs/pandoc_templates/pandoc.template b/docs/pandoc_templates/pandoc.template index 24e1368..b4f858d 100644 --- a/docs/pandoc_templates/pandoc.template +++ b/docs/pandoc_templates/pandoc.template @@ -26,7 +26,7 @@ $endfor$ $for(header-includes)$ $endfor$ - $header-includes$ +$header-includes$ $if(math)$ $if(mathjax)$ diff --git a/docs/setup/contributor_code_of_conduct.md b/docs/setup/contributor_code_of_conduct.md index c7016a2..d710bc3 100644 --- a/docs/setup/contributor_code_of_conduct.md +++ b/docs/setup/contributor_code_of_conduct.md @@ -131,7 +131,7 @@ identified cryptographically, rather than through the domain name system. then at the root of your repository ```bash -ssh-keygen -t ed25519 -f .git/gandalf #to create your key pair +ssh-keygen -t ed25519 - C gandalf -f .git/gandalf #to create your key pair git config user.signingkey .git/gandalf.pub #tell git to use this key pair git config user.name gandalf #will be ignored git config user.email gandalf@ #fake email will be ignored @@ -146,7 +146,7 @@ git config include.path ../.gitconfig #sets various defaults, ssh signing among displayed by the git aliases of `.gitconfig` The nym in `.gitsigners` is the one that matters, though `user.email` - and `user.name` should be the same or sufficiently similar to + and `user.name` should be the same or sufficiently related to show you are not up to anything funny. # No race, sex, religion, nationality, or sexual preference @@ -242,47 +242,17 @@ attempts to develop software is going to survive. Linux is a dead man walking. # Style -Contributions should be gpg signed. - -Never use any email address on a gpg key related to this project -unless it is only used for project purposes, or a fake email, or the -email of an enemy. We don't want Gpg used to link different email -addresses as owned by the same entity, and we don't want email -addresses used to link people to the project, because those -identities would then come under state and quasi state pressure. - -if you add the recommended repository configuration defaults to your local repository configuration - -```bash -git config --local include.path ../.gitconfig -``` - -This will implement signed commits and will insist that you have `gpg` on your path, -and that you have configured a signing key in your local config. - -This may be inconvenient if you do not have `gpg` installed and set up. - `.gitconfig` adds several git aliases: 1. `git utcmt` to do a commit without recording your timezone in the git history -1. `git lg` to display the gpg trust information for the last few commits. - For this to be useful you need to import the repository public key - `public_key.gpg` into gpg, and `‑‑lsign` that key. +1. `git lg` to display the .gitsigner trust information for the last few commits. 1. `git graph` to graph the commit tree with signing status 1. `git alias` to display the git aliases. -To only pull signed commits from people you have listed: - -```bash -git config merge.verifySignatures true -gpg --import public_key.gpg -gpg --lsign 096EAE16FB8D62E75D243199BC4482E49673711C -``` - We ignore the Gpg Web of Trust model, and instead use the Zooko identity model. -We use Gpg signatures to verify that remote repository code +We use ssh signatures to verify that remote repository code is coming from an unchanging entity, not for Gpg Web of Trust. Web of Trust is too complicated and too user hostile to be workable or safe. No one ever used it in the intended manner. diff --git a/docs/setup/nixos.md b/docs/setup/nixos.md index c79ab49..7070927 100644 --- a/docs/setup/nixos.md +++ b/docs/setup/nixos.md @@ -257,4 +257,43 @@ Setup is also decribed as ridiculously easy -- compare and contrast with much gr And the huge disadvantage that it only exists for Nix 23.05, while the latest "stable" (not very stable at all) release is 24.05 -It also has only a minimal nginx setup. Not at all sure what will happen when I combine it with a real nginx setup. \ No newline at end of file +It also has only a minimal nginx setup. Not at all sure what will happen when I combine it with a real nginx setup. + +We have to pin to a particular release: The following code is an example of such pinning + +```nix +{ config, pkgs, ... }: { + imports = [ + # builtins.fetchTarbll pins Nixos to a particular release, prevents the lastest release (24.05)from being default installed. + (builtins.fetchTarball { + # Pick a release version you are interested in and set its hash, e.g. + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-23.05/nixos-mailserver-nixos-23.05.tar.gz"; + # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: + # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack + sha256 = "0000000000000000000000000000000000000000000000000000"; + }) + ]; + + mailserver = { + enable = true; + fqdn = "mail.example.com"; + domains = [ "example.com" ]; + + # A list of all login accounts. To create the password hashes, use + # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' + loginAccounts = { + "user1@example.com" = { + hashedPasswordFile = "/a/file/containing/a/hashed/password"; + aliases = ["postmaster@example.com"]; + }; + "user2@example.com" = { ... }; + }; + + # Use Let's Encrypt certificates. Note that this needs to set up a stripped + # down nginx and opens port 80. + certificateScheme = "acme-nginx"; + }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "security@example.com"; +} +``` \ No newline at end of file diff --git a/docs/setup/set_up_build_environments.md b/docs/setup/set_up_build_environments.md index 3f7bff0..ade10ef 100644 --- a/docs/setup/set_up_build_environments.md +++ b/docs/setup/set_up_build_environments.md @@ -3073,13 +3073,21 @@ directory url (with no trailing backslash). ### Git Daemon +Now integrated into Git, needs no separate install. + +When correctly set up, the url for repo foo.git is `git://host/foo` + git-daemon will listen on port 9418. By default, it will allow access to any directory that looks like a git directory and contains the magic file git-daemon-export-ok. This is by far the simplest and most direct way of allowing the world to get at your git repository. +[Git documentation for Git daemon](https://git-scm.com/docs/git-daemon) + +[Git Book for Git daemon](https://git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon) + ### Gitweb -Does much the same thing has git-daemon, makes your repository public with a +Does much the same thing as git-daemon, makes your repository public with a prettier user interface, and somewhat less efficient protocol. Gitweb provides a great deal of UI for viewing and interacting with your