wordpress-markdown-blog-loader 1.2.0__tar.gz → 1.3.1__tar.gz

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wordpress-markdown-blog-loader
-Version: 1.2.0
+Version: 1.3.1
 Summary: load markdown blogs into wordpress
 Home-page: https://github.com/binxio/wordpress-markdown-blog-loader
 Author: Mark van Holsteijn
@@ -25,7 +25,7 @@ Requires-Dist: python-frontmatter
 Requires-Dist: click
 Requires-Dist: pytz
 Requires-Dist: Pillow
-Requires-Dist: binx-og-image-generator>=1.2.5
+Requires-Dist: binx-og-image-generator>=1.2.6
 Requires-Dist: markdownify
 Requires-Dist: bs4
 Requires-Dist: html5lib
@@ -73,12 +73,21 @@ host = xebia.com
 
 [xebia.com]
 username = <your wordpress username>
-password = <your application password>
 ```
-Note that the application password is different from the password you use to login to your WordPress installation.
 
+## api host
 If the site is served through a CDN, you can also set the `api_host` which will be used as the hostname to invoke the WP REST API. 
 
+## password
+To authenticate you need an [application password](https://wordpress.com/support/security/two-step-authentication/application-specific-passwords/), which is different from the user password.
+
+We recommend to store  your application password in 1password and set the environment variable
+  WP_APP_PASSWORD using the [1password CLI](https://developer.1password.com/docs/cli):
+
+```shell
+WP_APP_PASSWORD="$(op read "op://Private/wordpress app password/password")" wp-md ...
+```
+
 ## Never touch the WP editor again
 
 Once you start to manage your blogs via this uploader, *do not edit* the blog via one of the WP editors. The editors are weird,
@@ -89,8 +98,14 @@ in the actual blog content. It will look like your uploaded changes are not appl
 To use the docker image as a command line utility, create the following alias:
 
 ```bash
-alias wp-md='docker run -v $HOME:$HOME -v $HOME/.wordpress.ini:/root/.wordpress.ini -v $PWD:/$PWD -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.2.0
-```
+alias wp-md='docker run \
+ -e WP_APP_PASSWORD="$(op read "op://Private/wordpress app password/password")" \
+ -v $HOME:$HOME \
+ -v $HOME/.wordpress.ini:/root/.wordpress.ini \
+ -v $PWD:/$PWD \
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.3.1
+```'
+Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 
 ## start a new blog
 To start a new blog, type:

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/README.md

@@ -37,12 +37,21 @@ host = xebia.com
 
 [xebia.com]
 username = <your wordpress username>
-password = <your application password>
 ```
-Note that the application password is different from the password you use to login to your WordPress installation.
 
+## api host
 If the site is served through a CDN, you can also set the `api_host` which will be used as the hostname to invoke the WP REST API. 
 
+## password
+To authenticate you need an [application password](https://wordpress.com/support/security/two-step-authentication/application-specific-passwords/), which is different from the user password.
+
+We recommend to store  your application password in 1password and set the environment variable
+  WP_APP_PASSWORD using the [1password CLI](https://developer.1password.com/docs/cli):
+
+```shell
+WP_APP_PASSWORD="$(op read "op://Private/wordpress app password/password")" wp-md ...
+```
+
 ## Never touch the WP editor again
 
 Once you start to manage your blogs via this uploader, *do not edit* the blog via one of the WP editors. The editors are weird,
@@ -53,8 +62,14 @@ in the actual blog content. It will look like your uploaded changes are not appl
 To use the docker image as a command line utility, create the following alias:
 
 ```bash
-alias wp-md='docker run -v $HOME:$HOME -v $HOME/.wordpress.ini:/root/.wordpress.ini -v $PWD:/$PWD -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.2.0
-```
+alias wp-md='docker run \
+ -e WP_APP_PASSWORD="$(op read "op://Private/wordpress app password/password")" \
+ -v $HOME:$HOME \
+ -v $HOME/.wordpress.ini:/root/.wordpress.ini \
+ -v $PWD:/$PWD \
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.3.1
+```'
+Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 
 ## start a new blog
 To start a new blog, type:

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/setup.py

@@ -11,7 +11,7 @@ dependencies = [
     "click",
     "pytz",
     "Pillow",
-    "binx-og-image-generator>=1.2.5",
+    "binx-og-image-generator>=1.2.6",
     "markdownify",
     "bs4",
     "html5lib",
@@ -27,7 +27,7 @@ with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
 
 setup(
     name="wordpress-markdown-blog-loader",
-    version="1.2.0",
+    version="1.3.1",
     url="https://github.com/binxio/wordpress-markdown-blog-loader",
     license="APL2",
     author="Mark van Holsteijn",

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/src/wordpress_markdown_blog_loader/api.py

@@ -1,20 +1,18 @@
 import configparser
 import logging
+import mimetypes
+import os
+import re
 from datetime import datetime
-from io import BytesIO
+from functools import cache
 from os.path import expanduser
 from pathlib import Path
 from typing import List, Dict, Iterator
 from typing import Optional, Union
 from urllib.parse import urlparse, ParseResult
-import mimetypes
-import numpy
-from functools import cache
-
 
 import pytz
 import requests
-from PIL import Image
 
 
 def get_default_host() -> Optional[str]:
@@ -25,6 +23,31 @@ def get_default_host() -> Optional[str]:
     config.read(expanduser("~/.wordpress.ini"))
     return config.defaults().get("host")
 
+def get_password(host: str) -> Optional[str]:
+    """
+    Returns a password from the environment variable for the specified host.
+
+    The default environment variable is WP_APP_PASSWORD. A password for a specific host can be
+    specified by setting an environment variable WP_APP_PASSWORD_<host> where
+    the host name is all uppercase and non characters and digits replaced with _.
+
+    If not set, None is returned.
+
+    >>> os.environ["WP_APP_PASSWORD_XEBIA_COM"] = "host_password"
+    >>> get_password('xebia.com')
+    'host_password'
+    >>> get_password('binx.io') is None
+    True
+    >>> os.environ["WP_APP_PASSWORD"] = "default_password"
+    >>> get_password('binx.io')
+    'default_password'
+    """
+    h = re.sub(r"[^a-zA-Z-0-9]", "_", host).upper()
+    if result := os.getenv(f"WP_APP_PASSWORD_{h}"):
+        return result
+
+    return os.getenv("WP_APP_PASSWORD")
+
 
 class WordpressEndpoint:
     def __init__(self, **kwargs):
@@ -40,13 +63,20 @@ class WordpressEndpoint:
         config = configparser.ConfigParser()
         config.read(expanduser("~/.wordpress.ini"))
 
-        self.host = host if host else config.defaults().get("host")
-        assert host, "no host specified and no default host found"
 
+        if not host:
+            host = config.defaults().get("host")
+            assert host, "no host specified and no default host found"
+
+        self.host = host
         self.api_host = config.get(host, "api_host", fallback=self.host)
         self.url = f"https://{self.api_host}/wp-json/wp/v2"
+
         self.username = config.get(host, "username")
-        self.password = config.get(host, "password")
+        self.password = get_password(host)
+        if not self.password:
+            logging.warning("taking plain text app password from configuration file, use WP_APP_PASSWORD environment variable instead!")
+            self.password = config.get(host, "password")
 
     def is_host_for(self, url: Union[str, ParseResult]) -> bool:
         result = url if isinstance(url, ParseResult) else urlparse(url)

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/src/wordpress_markdown_blog_loader/upload.py

@@ -68,7 +68,7 @@ def upsert_post(wp: Wordpress, blog: Blog) -> int:
 
 @click.command(name="upload")
 @click.option(
-    "--host", type=str, required=True, nargs=1, help="wordpress host to upload to"
+    "--host", type=str, required=False, nargs=1, help="wordpress host to upload to"
 )
 @click.option(
     "--regenerate-og-image",

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/src/wordpress_markdown_blog_loader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wordpress-markdown-blog-loader
-Version: 1.2.0
+Version: 1.3.1
 Summary: load markdown blogs into wordpress
 Home-page: https://github.com/binxio/wordpress-markdown-blog-loader
 Author: Mark van Holsteijn
@@ -25,7 +25,7 @@ Requires-Dist: python-frontmatter
 Requires-Dist: click
 Requires-Dist: pytz
 Requires-Dist: Pillow
-Requires-Dist: binx-og-image-generator>=1.2.5
+Requires-Dist: binx-og-image-generator>=1.2.6
 Requires-Dist: markdownify
 Requires-Dist: bs4
 Requires-Dist: html5lib
@@ -73,12 +73,21 @@ host = xebia.com
 
 [xebia.com]
 username = <your wordpress username>
-password = <your application password>
 ```
-Note that the application password is different from the password you use to login to your WordPress installation.
 
+## api host
 If the site is served through a CDN, you can also set the `api_host` which will be used as the hostname to invoke the WP REST API. 
 
+## password
+To authenticate you need an [application password](https://wordpress.com/support/security/two-step-authentication/application-specific-passwords/), which is different from the user password.
+
+We recommend to store  your application password in 1password and set the environment variable
+  WP_APP_PASSWORD using the [1password CLI](https://developer.1password.com/docs/cli):
+
+```shell
+WP_APP_PASSWORD="$(op read "op://Private/wordpress app password/password")" wp-md ...
+```
+
 ## Never touch the WP editor again
 
 Once you start to manage your blogs via this uploader, *do not edit* the blog via one of the WP editors. The editors are weird,
@@ -89,8 +98,14 @@ in the actual blog content. It will look like your uploaded changes are not appl
 To use the docker image as a command line utility, create the following alias:
 
 ```bash
-alias wp-md='docker run -v $HOME:$HOME -v $HOME/.wordpress.ini:/root/.wordpress.ini -v $PWD:/$PWD -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.2.0
-```
+alias wp-md='docker run \
+ -e WP_APP_PASSWORD="$(op read "op://Private/wordpress app password/password")" \
+ -v $HOME:$HOME \
+ -v $HOME/.wordpress.ini:/root/.wordpress.ini \
+ -v $PWD:/$PWD \
+ -w $PWD ghcr.io/binxio/wordpress-markdown-blog-loader:1.3.1
+```'
+Assuming that your WordPress app password is stored in the 1password Private vault under the name `wordpress app password`
 
 ## start a new blog
 To start a new blog, type:

{wordpress-markdown-blog-loader-1.2.0 → wordpress_markdown_blog_loader-1.3.1}/src/wordpress_markdown_blog_loader.egg-info/requires.txt

@@ -4,7 +4,7 @@ python-frontmatter
 click
 pytz
 Pillow
-binx-og-image-generator>=1.2.5
+binx-og-image-generator>=1.2.6
 markdownify
 bs4
 html5lib