import re
import logging
import distutils
+import distutils.version
import urlparse
import hashlib
import sqlalchemy.exc
'WIZARD_SECURE_AUTH_KEY': 'SECURE_AUTH_KEY',
'WIZARD_LOGGED_IN_KEY': 'LOGGED_IN_KEY',
'WIZARD_NONCE_KEY': 'NONCE_KEY',
+ 'WIZARD_AUTH_SALT': 'AUTH_SALT',
+ 'WIZARD_SECURE_AUTH_SALT': 'SECURE_AUTH_SALT',
+ 'WIZARD_LOGGED_IN_SALT': 'LOGGED_IN_SALT',
+ 'WIZARD_NONCE_SALT': 'NONCE_SALT',
})
class Application(app.Application):
substitutions.update(php.substitutions)
install_schema = install.ArgSchema("db", "admin", "email", "title")
deprecated_keys = set(['WIZARD_SECRETKEY'])
- random_keys = set(['WIZARD_SECRETKEY', 'WIZARD_AUTH_KEY', 'WIZARD_SECURE_AUTH_KEY', 'WIZARD_LOGGED_IN_KEY', 'WIZARD_NONCE_KEY'])
+ random_keys = set([
+ 'WIZARD_SECRETKEY',
+ 'WIZARD_AUTH_KEY',
+ 'WIZARD_SECURE_AUTH_KEY',
+ 'WIZARD_LOGGED_IN_KEY',
+ 'WIZARD_NONCE_KEY',
+ 'WIZARD_AUTH_SALT',
+ 'WIZARD_SECURE_AUTH_SALT',
+ 'WIZARD_LOGGED_IN_SALT',
+ 'WIZARD_NONCE_SALT',
+ ])
random_blacklist = set(['put your unique phrase here'])
def urlFromExtract(self, deployment):
try:
meta = sql.connect(deployment.dsn)
- wp_options = meta.tables["wp_options"]
+ try:
+ wp_options = meta.tables["wp_options"]
+ except KeyError:
+ return None
query = wp_options.select(wp_options.c.option_name == 'home')
return query.execute().fetchone()['option_value']
except sqlalchemy.exc.OperationalError:
def checkWeb(self, deployment):
return self.checkWebPage(deployment, "",
outputs=["<html", "WordPress", "feed"],
- exclude=["Error establishing a database connection"])
+ exclude=["Error establishing a database connection", "Account unknown"])
def detectVersion(self, deployment):
return self.detectVersionFromFile("wp-includes/version.php", php.re_var("wp_version"))
def install(self, version, options):
php.ini_replace_vars()
def upgrade(self, d, version, options):
result = d.fetch("wp-admin/upgrade.php?step=1")
- if "Upgrade Complete" not in result and "No Upgrade Required" not in result:
+ if "Upgrade Complete" not in result and "Update Complete" not in result and \
+ "No Upgrade Required" not in result and "No Update Required" not in result:
raise app.UpgradeFailure(result)
+ @app.throws_database_errors
def backup(self, deployment, backup_dir, options):
- app.backup_database(backup_dir, deployment)
+ sql.backup(backup_dir, deployment)
+ @app.throws_database_errors
def restore(self, deployment, backup_dir, options):
- app.restore_database(backup_dir, deployment)
+ sql.restore(backup_dir, deployment)
+ @app.throws_database_errors
def remove(self, deployment, options):
- app.remove_database(deployment)
+ sql.drop(deployment.dsn)
Application.resolutions = {
'wp-config.php': [