From 832c9879c8b7410c929c01257002b191205ea709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 24 Jan 2017 14:29:57 +0100 Subject: [PATCH] [omemo] Update/Delete various files --- omemo/.pylintrc | 379 -------------------------------------------- omemo/.style.yapf | 4 - omemo/CHANGELOG | 33 +++- omemo/README.md | 90 ----------- omemo/pkgs/PKGBUILD | 24 --- omemo/setup.cfg | 2 - 6 files changed, 29 insertions(+), 503 deletions(-) delete mode 100644 omemo/.pylintrc delete mode 100644 omemo/.style.yapf delete mode 100644 omemo/README.md delete mode 100644 omemo/pkgs/PKGBUILD delete mode 100644 omemo/setup.cfg diff --git a/omemo/.pylintrc b/omemo/.pylintrc deleted file mode 100644 index 7222fa7..0000000 --- a/omemo/.pylintrc +++ /dev/null @@ -1,379 +0,0 @@ -[MASTER] - -# Specify a configuration file. -#rcfile= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Add files or directories to the blacklist. They should be base names, not -# paths. -ignore=CVS - -# Pickle collected data for later comparisons. -persistent=yes - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins= - -# Use multiple processes to speed up Pylint. -jobs=1 - -# Allow loading of arbitrary C extensions. Extensions are imported into the -# active Python interpreter and may run arbitrary code. -unsafe-load-any-extension=no - -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code -extension-pkg-whitelist= - -# Allow optimization of some AST trees. This will activate a peephole AST -# optimizer, which will apply various small optimizations. For instance, it can -# be used to obtain the result of joining multiple strings with the addition -# operator. Joining a lot of strings can lead to a maximum recursion error in -# Pylint and this flag can prevent that. It has one side effect, the resulting -# AST will be different than the one from reality. -optimize-ast=no - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED -confidence= - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). See also the "--disable" option for examples. -#enable= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating - - -[REPORTS] - -# Set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html. You can also give a reporter class, eg -# mypackage.mymodule.MyReporterClass. -output-format=text - -# Put messages in a separate file for each module / package specified on the -# command line instead of printing them on stdout. Reports (if any) will be -# written in a file name "pylint_global.[txt|html]". -files-output=no - -# Tells whether to display a full report or only the messages -reports=yes - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= - - -[BASIC] - -# List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,input - -# Good variable names which should always be accepted, separated by a comma -good-names=i,j,k,e,Run,_,log,ui,iq,db - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct function names -function-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for function names -function-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct variable names -variable-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for variable names -variable-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct constant names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Naming hint for constant names -const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Regular expression matching correct attribute names -attr-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for attribute names -attr-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct argument names -argument-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for argument names -argument-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Naming hint for inline iteration names -inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ - -# Regular expression matching correct class names -class-rgx=[A-Z_][a-zA-Z0-9]+$ - -# Naming hint for class names -class-name-hint=[A-Z_][a-zA-Z0-9]+$ - -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Naming hint for module names -module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Regular expression matching correct method names -method-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Naming hint for method names -method-name-hint=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - - -[ELIF] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - - -[FORMAT] - -# Maximum number of characters on a single line. -max-line-length=100 - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - -# List of optional constructs for which whitespace checking is disabled. `dict- -# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. -# `trailing-comma` allows a space between comma and closing bracket: (a, ). -# `empty-line` allows space-only lines. -no-space-check=trailing-comma,dict-separator - -# Maximum number of lines in a module -max-module-lines=1000 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -expected-line-ending-format= - - -[LOGGING] - -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO - - -[SIMILARITIES] - -# Minimum lines number of a similarity. -min-similarity-lines=4 - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=no - - -[SPELLING] - -# Spelling dictionary name. Available dictionaries: none. To make it working -# install python-enchant package. -spelling-dict= - -# List of comma separated words that should not be checked. -spelling-ignore-words= - -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no - - -[TYPECHECK] - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis. It -# supports qualified module names, as well as Unix pattern matching. -ignored-modules= - -# List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamically set). This supports can work -# with qualified names. -ignored-classes= - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - - -[VARIABLES] - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_$|dummy - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_,_cb - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make,_show_lock_image - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.* - -# Maximum number of locals for function / method body -max-locals=20 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of branch for function / method body -max-branches=12 - -# Maximum number of statements in function / method body -max-statements=50 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of attributes for a class (see R0902). -max-attributes=7 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=2 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - -# Maximum number of boolean expressions in a if statement -max-bool-expr=5 - - -[IMPORTS] - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=regsub,TERMIOS,Bastion,rexec - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=Exception diff --git a/omemo/.style.yapf b/omemo/.style.yapf deleted file mode 100644 index 9277d6a..0000000 --- a/omemo/.style.yapf +++ /dev/null @@ -1,4 +0,0 @@ -[style] -based_on_style = pep8 -align_closing_bracket_with_visual_indent = true -join_multiple_lines = true diff --git a/omemo/CHANGELOG b/omemo/CHANGELOG index 20bd7d1..82c46bd 100644 --- a/omemo/CHANGELOG +++ b/omemo/CHANGELOG @@ -1,8 +1,33 @@ +1.0.1 / 2017-01-14 +- Better XEP Compliance +- Bugfixes + +1.0.0 / 2016-12-04 +- Bugfixes + +0.9.9 / 2016-12-01 +- Bugfixes + +0.9.8 / 2016-11-28 +- Fix a Problem where OMEMO wouldnt activate after the plugin is updated +- Add QR Verification Code to Plugin Config + +0.9.7 / 2016-11-12 +- Bugfixes + +0.9.6 / 2016-11-01 +- Bugfixes + +0.9.5 / 2016-10-10 +- Add GroupChat BETA +- Add Option to delete Fingerprints +- Add Option to deactivate Accounts for OMEMO + 0.9.0 / 2016-08-28 - - Send INFO message to resources who dont support OMEMO - - Check dependencys and give correct error message - - Dont process PreKeyWhisperMessages without PreKey - - Dont process PGP messages +- Send INFO message to resources who dont support OMEMO +- Check dependencys and give correct error message +- Dont process PreKeyWhisperMessages without PreKey +- Dont process PGP messages 0.8.1 / 2016-08-05 - Query own Device Bundles on send button press diff --git a/omemo/README.md b/omemo/README.md deleted file mode 100644 index e72cceb..0000000 --- a/omemo/README.md +++ /dev/null @@ -1,90 +0,0 @@ -# OMEMO Plugin for Gajim - -This Plugin adds support for the [OMEMO Encryption](http://conversations.im/omemo) to [Gajim](https://gajim.org/). This -plugin is [free software](http://www.gnu.org/philosophy/free-sw.en.html) -distributed under the GNU General Public License version 3 or any later version. - -## Installation - -Before you open any issues please read our [Wiki](https://github.com/omemo/gajim-omemo/wiki) which addresses some problems that can occur during an install - -### Linux - -See [Linux Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-on-Linux) - -### Windows - -See [Windows Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-on-Windows) - -### Via Package Manager -#### Arch -See [Arch Wiki](https://wiki.archlinux.org/index.php/Gajim#OMEMO_Support) - -#### Gentoo -`layman -a flow && emerge gajim-omemo` - -### Via PluginInstallerPlugin - -Install the current stable version via the Gajim PluginManager. You *need* Gajim -version *0.16.5*. If your package manager does not provide an up to date version -you can install it from the official Mercurial repository. *DO NOT USE* gajim -0.16.4 it contains a vulnerability, which is fixed in 0.16.5. -```shell -hg clone https://hg.gajim.org/gajim -cd gajim -hg update gajim-0.16.5 --clean -``` - -**NOTE:** You *have* to install `python-axolotl` via `pip`. Depending on your setup you might -want to use `pip2` as Gajim is using python2.7. If you are using the official repository, -do not forget to install the `nbxmpp` dependency via pip or you package manager. - -if you still have problems, we have written down the most common problems [here](https://github.com/omemo/gajim-omemo/wiki/It-doesnt-work,-what-should-i-do%3F-(Linux)) - -## Running -Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager. -If your contact supports OMEMO you should see a new orange fish icon in the chat window. - -Encryption will be enabled by default for contacts that support OMEMO. -If you open the chat window, the Plugin will tell you with a green status message if its *enabled* or *disabled*. -If you see no status message, your contact doesnt support OMEMO. -(**Beware**, every status message is green. A green message does not mean encryption is active. Read the message !) -You can also check if encryption is enabled/disabled, when you click on the OMEMO icon. - -When you send your first message the Plugin will query your contacts encryption keys and you will -see them in a readable fingerprint format in the fingerprint window which pops up. -you have to trust at least **one** fingerprint to send messages. -you can receive messages from fingerprints where you didnt made a trust decision, but you cant -receive Messages from *not trusted* fingerprints - - -## Debugging -To see OMEMO related debug output start Gajim with the parameter `-l -gajim.plugin_system.omemo=DEBUG`. - -## Hacking -This repository contains the current development version. If you want to -contribute clone the git repository into your Gajim's plugin directory. -```shell -mkdir ~/.local/share/gajim/plugins -p -cd ~/.local/share/gajim/plugins -git clone https://github.com/omemo/gajim-omemo -``` - -## Support this project -I develop this project in my free time. Your donation allows me to spend more -time working on it and on free software generally. - -My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWVmX6oBnEfV1` - -[![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/5038679) - -## I found a bug -Please report it to the [issue -tracker](https://github.com/omemo/gajim-omemo/issues). If you are experiencing -misbehaviour please provide detailed steps to reproduce and debugging output. -Always mention the exact Gajim version. - -## Contact -You can contact me via email at `bahtiar@gadimov.de` or follow me on -[Twitter](https://twitter.com/_kalkin) diff --git a/omemo/pkgs/PKGBUILD b/omemo/pkgs/PKGBUILD deleted file mode 100644 index 21ce483..0000000 --- a/omemo/pkgs/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Tommaso Sardelli - -pkgname=gajim-plugin-omemo -_pkgname=gajim-omemo -pkgver=0.8.1 -pkgrel=2 -pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." -arch=(any) -url="https://github.com/omemo/${_pkgname}" -license=('GPL') -depends=("gajim" "python2-setuptools" "python2-cryptography" "python2-axolotl-git") -provides=('gajim-plugin-omemo') -conflicts=('gajim-plugin-omemo-git') -source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('e9280033fbe111f5010f2e9e8fa32c5b8c0abe308000f9a043a1c5e8215c96f8be434876b1d72cc8d68aed4ddaebe9655c70f9648a2db718cba71d90434fee2e') - -package() { - cd $srcdir/gajim-omemo-${pkgver} - rm -r CHANGELOG COPYING doc pkgs README.md - install -d ${pkgdir}/usr/share/gajim/plugins/omemo - cp -r * ${pkgdir}/usr/share/gajim/plugins/omemo/ -} - -# vim:set ts=2 sw=2 et: diff --git a/omemo/setup.cfg b/omemo/setup.cfg deleted file mode 100644 index 2cd96cc..0000000 --- a/omemo/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[flake8] -max-line-length=80